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

Conflicts:
	src/Player.hh
some error fixed...
menu recode...
new Menu !