Merge remote-tracking branch 'origin/master'

Conflicts:
	Racegame/Racegame/Racegame/Game.Designer.cs
	Racegame/Racegame/Racegame/Game.cs