Difficulty
ezsfzefze
Merge options + musique
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien

Conflicts:
	bin/classes/fr/ups/l3info/l3info_catchgameactivity/CatchGameActivity.class