Merge remote-tracking branch 'origin/master'

Conflicts:
	ZombieApocalypseSimulator/Models/Items/Magazine.cs
	ZombieApocalypseSimulator/Program.cs