Solving Conflicts
Merge branch 'master' of https://github.com/Hector-hedb12/Zombies.git

Conflicts:
	Classes/AppDelegate.cpp