Replay
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien
Replay 2
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien
A ne pas prendre en compte
Add music + button to enable/disable music in option
Logo change
Merge branch 'master-julien' of https://github.com/julienCsj/ProjetAndroid

Conflicts:
	bin/AndroidManifest.xml
	gen/fr/ups/l3info/l3info_catchgametemplate/R.java
Fix R File