Ajout affichage panels
Merge branch 'master' of https://github.com/jeantoulza/LO43

Conflicts:
	src/main/GameState.java
Merge branch 'master' of https://github.com/jeantoulza/LO43

Conflicts:
	src/main/GameState.java