Patrice Vignola 1cc4ddc40f Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/characters.meta
	Assets/characters/Source/Animator_controllers/Unity_Free_anims.controller
	Assets/prefabs.meta
	ProjectSettings/ProjectSettings.asset
2016-01-30 12:59:59 -05:00
..
2016-01-30 09:49:32 -05:00
2016-01-30 09:49:32 -05:00