Add exit
Fix merge conflicts
Merge branch 'master' of https://github.com/iplukens/dragon-engine

Conflicts:
	LevelManager.cpp
	Makefile

Fix merge conflicts