Committing platform prefab again.
Committing meta files.
Merge branch 'master' of https://github.com/ctbailey/gamejam2014

Conflicts:
	BlockColorChanger.cs.meta
	Platform.prefab.meta