Here come the clones
Trying to fix spring
Merge branch 'Johnny!' of https://github.com/torrmercury/GlobalGameJam2014

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity