Merge branch 'master' of https://github.com/03knoppg/ToJam2014

Conflicts:
	Assets/Prefabs.meta
lots of shit