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
Merge remote-tracking branch 'origin/Johnny!' into newmaster
toilet works as well as it is going to be
Merge remote-tracking branch 'origin/Johnny!' into newmaster
commit some shit
Merge remote-tracking branch 'origin/romans-design' into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
title music
the instructions
Merge branch 'newmaster' into seori
no message
Merge pull request #31 from torrmercury/romans-design

no message
no message
Merge branch 'newmaster' into seori
done deleted some things yo
Merge remote-tracking branch 'origin/romans-design' into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
Revert "done deleted some things yo"

This reverts commit 74419643f8631ab0acfd81473f48c713626cdd5f.
Merge remote-tracking branch 'origin/romans-design' into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
Merge branch 'newmaster' of https://github.com/torrmercury/GlobalGameJam2014 into newmaster

Conflicts:
	Frank's Apartment/Assets/Scenes/Prototype.unity
bubbles work now
Merge remote-tracking branch 'origin/Johnny!' into newmaster

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