Build #54
Merge branch 'master' of https://github.com/Gurke1993/DestroySpace

Conflicts:
	settings.txt

Build #55