Merge origin/master

Conflicts:
	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/Ennemi.java
	src/ca/qc/bdeb/C37/tp2/objets/Joueur.java
	src/ca/qc/bdeb/C37/tp2/objets/TirEnnemi.java
Major Update
- Bug Fix
- PowerUps
- Better Graphics
- Life implemented
Major Update
- Bug Fix
- PowerUps
- Better Graphics
- Life implemented