GUI
Merge branch 'master' of https://github.com/KevinSleegers/spacebattalion

Conflicts:
	index.html