Test
Changement Start en option
Heritage d'un classe qui définit nos JFrame
Je touche à tous
test
Don't worry, i just delete conflict, and Start.java too, option replace
it.
Merge branch 'master' of https://github.com/penouille/Stratego-ucl.git

Conflicts:
	src/Controller/controller.java
	src/Game/Game.java
	src/Pion/pion.java
	src/System/system.java
	src/View/Start.java
	src/View/administratorGUI.java