Conflicting change.
Merge branch 'master' of https://github.com/cpluspluslab/a-game.git

Conflicts:
	main.cpp