RosimInc 445a1b3da7 Merge branch 'master' of https://github.com/ConjureETS/OuijaMTLGJ2016
Conflicts:
	Assets/scenes/GameplayScene.unity
	Assets/scripts/Character.cs
	Assets/scripts/LevelManager.cs
2016-01-31 15:14:12 -05:00
..
2016-01-31 14:57:20 -05:00
2016-01-31 15:05:29 -05:00
2016-01-30 09:49:32 -05:00
2016-01-31 14:51:12 -05:00
2016-01-31 15:08:14 -05:00
2016-01-31 12:47:32 -05:00
2016-01-30 09:49:32 -05:00
2016-01-31 15:08:14 -05:00
2016-01-31 14:54:16 -05:00
2016-01-31 11:24:36 -05:00
2016-01-30 09:49:32 -05:00
2016-01-31 14:51:12 -05:00
2016-01-31 14:51:12 -05:00
2016-01-31 14:57:20 -05:00
2016-01-30 09:49:32 -05:00
2016-01-31 14:51:12 -05:00
2016-01-30 01:15:35 -05:00
2016-01-30 09:49:32 -05:00
2016-01-30 01:15:35 -05:00
2016-01-30 01:15:35 -05:00
2016-01-30 01:15:35 -05:00
2016-01-30 09:49:32 -05:00