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
Merge remote-tracking branch 'origin/Johnny!' into newmaster