Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Asteroid.v12.suo
	Asteroid/Asteroid/bin/x86/Debug/Asteroid.exe
	Asteroid/Asteroid/bin/x86/Debug/Asteroid.pdb
	Asteroid/Asteroid/obj/x86/Debug/Asteroid.exe
	Asteroid/Asteroid/obj/x86/Debug/Asteroid.pdb