Merge branch 'dropbox'

Conflicts:
	Game.c