Stuff

Stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	SP1Framework/game.cpp
	SP1Framework/game.h