Added menu class
Menu now works!!!
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/ControlleurObjets.java
	src/ca/qc/bdeb/C37/tp2/objets/CtrlSouris.java
	src/ca/qc/bdeb/C37/tp2/objets/Joueur.java
	src/ca/qc/bdeb/C37/tp2/window/Jeu.java
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/Joueur.java
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/CtrlSouris.java
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/ControlleurObjetjava
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/CtrlSouris.java
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/Joueur.java
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/ControlleurObjet.java
Merge origin/master

Conflicts:
	src/ca/qc/bdeb/C37/tp2/objets/Jeu.java