Testing things with player
Merge branch 'master' of github.com:Theo13/damncute

Conflicts:
	Bullet.hh
	DisplayManager.cpp
	Makefile
	Sprite.cpp
Merge branch 'master' of github.com:Theo13/damncute
Merge branch 'master' of github.com:Theo13/damncute
Merge branch 'master' of github.com:Theo13/damncute
Merge branch 'master' of github.com:Theo13/damncute
Added Player class