Merge branch 'master' into Johnny!

* master:
  Added thought bubbles
Merge branch 'master' into Johnny!

* master:
  Edited AI script slightly Added thought bubble render appear and disappear
  Put in dead bodies. They are in prefabs/Tenant/DeadTenant
Hopefully fixed the spring animation?
Added Bathroom
Merge remote-tracking branch 'origin/Johnny!'
Merge branch 'master' into Matt

Conflicts:
	Frank's Apartment/Frank's Apartment.userprefs
Started writing HideRoom script
Merge branch 'master' into romans-design

* master:
  Hopefully fixed the spring animation?
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
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
I hate the spring
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
Taggin’ dat wood
Merge pull request #24 from torrmercury/Johnny!

Taggin’ dat wood
No more clones.