ajout de git ignore
.
merge ok
Merge branch 'master' of github.com:ennis/rift
collisions de primitives allignees
Merge branch 'master' of github.com:ennis/rift