Minor changes
Merge branch 'master' into fidouda
Merge branch 'master' into fidouda
First Phone Sync
Merge conflict solved
Debut du swipe
Merge conflicts resolved
Ajout de collisions de bases
Conflicts resolved
Merge pull request #24 from benbonjour/master

Ajout d'une base de mécanique de collisions
Ajout du swipe motion
Merge confilcts resolved
Merge pull request #25 from Fidouda/fidouda

Ajout du swipe motion
conflict resolved