Merge branch 'newmaster' of https://github.com/torrmercury/GlobalGameJam2014 into newmaster

# By Matt Chen (4) and others
# Via Matt Chen (6) and others
* 'newmaster' of https://github.com/torrmercury/GlobalGameJam2014:
  all sorts of stuff
  FRANKUUUU
  Commit to these thought bubbles!
  SOUNDS WORKKKKK
  things and stuff
  Door and TV folders. In door: Unlock and Lock. In TV: 'Turn on TV'  sound, static (which can be looped), and 'Turn off TV' sound
  couch fixed
commit some shit
Merge remote-tracking branch 'origin/romans-design' into newmaster

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