Merge remote-tracking branch 'origin/master'

Conflicts:
	Racegame/Racegame/MainForm.cs