Merge remote-tracking branch 'origin/Life' into Life

Conflicts:
	gameClass.cpp