Merge branch 'release-0.4'

BenLauwens · BenLauwens · commit 0aa4201f9da7 · 2017-09-12T15:48:35.000+02:00
# Conflicts:
#	docs/src/index.md
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -1,3 +1,3 @@
-# SimJulia
+# Overview
 
-a discrete event process oriented simulation framework written in [Julia](http://julialang.org/) inspired by the Python library [SimPy](https://simpy.readthedocs.io/).
+SimJulia is discrete event process oriented simulation framework written in [Julia](http://julialang.org/) inspired by the Python library [SimPy](https://simpy.readthedocs.io/).
