Attacking Is Done
Merge remote-tracking branch 'origin/master'

Conflicts:
	ZombieApocalypseWPF/MainWindow.xaml
	ZombieApocalypseWPF/MainWindow.xaml.cs
Merge branch 'master' of https://github.com/garrett92895/ZombocalypseSimulator2014

Conflicts:
	ZombieApocalypseSimulator/Controller.cs
	ZombieApocalypseWPF/MainWindow.xaml.cs