Started writing HideRoom script
Merge branch 'master' into romans-design

* master:
  Hopefully fixed the spring animation?
Created a CharacterRoomLocation script
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
Merge remote-tracking branch 'origin/Johnny!' into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
Merge remote-tracking branch 'origin/romans-design' into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
Merge branch 'newmaster' into Matt