Merge branch 'master' of github.com:Tritlo/JerbalSpaceProgram

Conflicts:
	public/index.html
Merge branch 'master' into website

Conflicts:
	public/index.html