Commit de AI
Merge remote-tracking branch 'origin/master' into valentin
Creation d'une salle basique
Canvas action bar mis en place pour le mouvement
Merge remote-tracking branch 'origin/julien'
Test
Test2

azazz
Test2

azazz
Tets3

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

Conflicts:
	src/unityProject/.gitignore
Dungeon comit
Commit final
Merge remote-tracking branch 'origin/julien'
Serveur
Merge remote-tracking branch 'origin/pierre'
Merge remote-tracking branch 'origin/julien'
Merge branch 'master' of https://github.com/arkkange/Trinity
Test Commit final

Commit du dungeon