some
Merge branch 'master' of github.com:teamMadScientist/DeathCurtain_prototype

Conflicts:
	damncute/Core/Core.cpp
	damncute/Core/Core.hh
	src/DisplayManager.cpp