update
Merge remote-tracking branch 'origin/story' into story

Conflicts:
	Game.cpp
	a.exe
	classes.h
	definitions.cpp