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

* master:
  Hopefully fixed the spring animation?
Trying to fix spring
Merge branch 'Johnny!' of https://github.com/torrmercury/GlobalGameJam2014

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
Created a CharacterRoomLocation script
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