hitbox
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid
Options pas testé
Awesomeness
On est pas mal la !
Merge branch 'master-options' of https://github.com/julienCsj/ProjetAndroid into master-leo

Conflicts:
	src/fr/ups/l3info/l3info_catchgameactivity/CatchGameOptionsActivity.java
Add music + button to enable/disable music in option