Updated ballchase
Merge branch 'master' of https://github.com/dasmith91/ggj-2014

Conflicts:
	Assets/ArtskillZ Store/Free SciFi Textures/Materials/FloorTech02c.mat.meta
	Assets/MovingPlatform.cs
	Assets/Src/timeController.cs
	ggj-2014-csharp.suo