Merge branch 'newmaster' into Johnny!

* newmaster:
Merge branch 'newmaster' into Johnny!

* newmaster:
  Created title screen and GUI ability
  I hate the spring
couch fixed
Merge branch 'newmaster' of https://github.com/torrmercury/GlobalGameJam2014 into newmaster
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
things and stuff
Merge pull request #26 from torrmercury/Johnny!

Johnny!
Merge branch 'newmaster' into Johnny!

* newmaster:
  couch fixed
  no message
  no message
  started working on title screen
  Music folder with a 'menu' version (if we have one, just means no bass) and a 'all' version for the background of actual game
  Spring works once now and toilet works well Prototype and title scenes work :D
  Folder in Sounds called 'Frank's Voice' with three sound files recorded
  Added logo and and toilet water again?
  added toilet water and logo
SOUNDS WORKKKKK
Merge branch 'newmaster' of https://github.com/torrmercury/GlobalGameJam2014 into newmaster
Merge remote-tracking branch 'origin/seori' into newmaster
Commit to these thought bubbles!
FRANKUUUU
Merge remote-tracking branch 'origin/Johnny!' into newmaster
Merge branch 'newmaster' into Johnny!

* newmaster:
  SOUNDS WORKKKKK
  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
all sorts of stuff
Merge remote-tracking branch 'origin/Johnny!' into newmaster
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