Score game activity OK
Better hitbox
Merge branch 'master-julien' of https://github.com/julienCsj/ProjetAndroid into master-leo
Merge branch 'test' of https://github.com/julienCsj/ProjetAndroid into master-leo

Conflicts:
	src/fr/ups/l3info/l3info_catchgameactivity/CatchGameActivity.java
Begin Fruit basket
Merge branch 'master-julien' of https://github.com/julienCsj/ProjetAndroid into master-leo
Fruit basket OK !
Merge branch 'master-julien' of https://github.com/julienCsj/ProjetAndroid into master-leo
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien
GO GO GO
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien
Remove regression
Work on AIM
Replay
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien
Hitbox
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien
hitbox
Replay 2
Merge branch 'master' of https://github.com/julienCsj/ProjetAndroid into master-julien