Update .gitignore
Merge origin/maxime into maxime
Merge origin/dev
Merge branch 'master' into maxime
Update README.md
update groupID and notes.txt
Merge branch 'master' into maxime
test
refresh project
refrech project
indentation
Merge branch 'master' into maxime
Merge branch 'maxime' of https://github.com/mbret/jenseits-von-theben into maxime
gestion des fichiers de conf OK
ajout de options.ini pour les options de l'utilisateurs de l'applciation (son, etc)
init des areas à partir du fichier de conf OK
Merge branch 'maxime' of https://github.com/mbret/jenseits-von-theben into maxime

Conflicts:
	src/test/java/com/miage/game/TestBoard.java
	src/test/java/com/miage/game/TestPlayer.java
	src/test/resources/config.properties
test
test