refactorings
Merge branch 'master' of https://github.com/syre/SuperAwesomeGame

Conflicts:
	Main.py
fixed