Signed-off-by: serengeor <serengeor@gmail.com>
Merge branch 'application' of https://github.com/Murloc992/ZombieGameProject.git into application

Conflicts:
	src/application.h
	src/main.cpp