Merge branch 'master' of github.com:Saevon/spacebattle

Conflicts:
	main.py