OldUpload
Merge remote-tracking branch 'origin/master'

Conflicts:
	Arkanoid.sdf
	Arkanoid.v12.suo
	GameState.cpp