Working menu
Working menu
Merge remote-tracking branch 'origin/master'

Conflicts:
	Platformer/src/ihm/GameMenu.java
	Platformer/src/ihm/Interface.java