Compiling Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	source-code/program/Game.cpp