norm
Merge branch 'master' of https://github.com/Morphei/course_work
hero moving
Conflicts:
	course_work.pro.user
	game.cpp