Merge branch 'master' of https://github.com/MartinM-B/BeU

Conflicts:
	src/InYourFaceGame.py