I'm only commiting this to synch.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZombieApocalypseSimulator/Controller.cs
	ZombieApocalypseSimulator/GameArea.cs
	ZombieApocalypseSimulator/Program.cs