Oh boy.
changes
Merge branch 'master' of https://github.com/Murloc992/ZombieGameProject.git

Conflicts:
	src/main.cpp
Merge branch 'develop' of https://github.com/Murloc992/ZombieGameProject.git
c++11 code completion
Merge branch 'develop' of https://github.com/Murloc992/ZombieGameProject.git
devel push?