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!
Merge branch 'master' into Johnny!

* master:
  Added character animation prefabs. (inside Resources/Tenant)
Couch animation now works
deleted deprecated .blend file + made Prototype scene
Merge branch 'Matt'

Conflicts:
	Frank's Apartment/Assets/Scenes/test scene.unity
removed line shit, going to start navmesh in test scene
Merge branch 'master' into Johnny!

* master:
  deleted deprecated .blend file + made Prototype scene
  Couch animation now works
Merge pull request #18 from torrmercury/Johnny!

Johnny!
Merge branch 'romans-design'

* romans-design:
  Added thought bubbles

Conflicts:
	Frank's Apartment/Assets/Scenes/test scene.unity