bugfixes
Merge branch 'master' of https://github.com/usercngit/INF123_TeamCSS

Conflicts:
	srcGame/main.py