Merge branch 'master' into Johnny!

* master:
  remade portrait prefab and fixed tv screen
something wrong
Working again
Merge pull request #17 from torrmercury/Johnny!

Johnny!