Canvas action bar mis en place pour le mouvement
visible meta files
Merge remote-tracking branch 'origin/julien'
Test2

azazz
Merge remote-tracking branch 'origin/valentin'
gitingore change
Merge remote-tracking branch 'origin/julien'
Merge branch 'master' of https://github.com/arkkange/Trinity

Conflicts:
	src/unityProject/.gitignore