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