fix
Merge branch 'master' of github.com:Theo13/GGJ2014

Conflicts:
	src/DisplayManager.cpp