player limitation on X and Y
Merge branch 'master' of github.com:Theo13/GGJ2014
super manette
Merge branch 'master' of github.com:Theo13/GGJ2014

Conflicts:
	src/DisplayManager.cpp