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

Conflicts:
	src/DisplayManager.cpp
	src/Enemy.o
Merge branch 'master' of github.com:Theo13/GGJ2014
frame before boss set
Merge branch 'master' of github.com:Theo13/GGJ2014