blah
Merge branch 'master' into Matt

Conflicts:
	Frank's Apartment/Frank's Apartment.userprefs
Merge branch 'master' into Matt
Merge branch 'master' into Matt
Changed how the tenant dies (using on trigger enter)
Merge branch 'master' into Matt
TV now works, made the framework for all other furnitures
Door now works
Merge branch 'master' into Matt
Merge pull request #10 from torrmercury/Matt

Matt