torrmercury/GlobalGameJam2014 — pull request #23 by JMkitarian (2014-01-26 17:08:31+00:00)
Title: stuff with collision

Merge branch 'master' into Johnny!

* master:
Added Bathroom
Hopefully fixed the spring animation?
added sounds in new sounds folder in prototype

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