I haven't commited since yesterday.
Merge remote-tracking branch 'origin/master'

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