Started work on AI
Objective Choosing
Merge branch 'master' into Johnny!

* master:
  created the Roman scene
  Started creating Bedroom
  Changed Metafile and asset serialization options to create git flow
  Made errors go away for unfinished code. (commented out)

Conflicts:
	Frank's Apartment/Assets/Code/Tenant/TenantAI.cs
	Frank's Apartment/Assets/Images.meta
	Frank's Apartment/Assets/Images/Materials.meta
Commented and cleaned code
Merge pull request #5 from torrmercury/romans-design

New room elements
Merge pull request #4 from torrmercury/Johnny!

Johnny!
blah
Merge branch 'master' into Matt

Conflicts:
	Frank's Apartment/Frank's Apartment.userprefs
Merge pull request #6 from torrmercury/romans-design

Pull for you!
Merge branch 'master' into Matt
Stupid fucking array.
Merge remote-tracking branch 'origin/Johnny!'

Conflicts:
	Frank's Apartment/ProjectSettings/TagManager.asset
Merge branch 'master' into Matt
Array works :D
Merge branch 'master' into Johnny!

* master:
  Pull for you!
  Added coach
  Created more walls and Room elements, TV
  Changed All game objects to sprites, restarted bedroom and put in walls and floor
  Put in Floor and Carpet, created ‘Room Elements’ folder

Conflicts:
	Frank's Apartment/Assets/Scenes/test scene.unity
Changed how the tenant dies (using on trigger enter)
Merge pull request #8 from torrmercury/Johnny!

Johnny!
Merge branch 'master' into Matt
TV now works, made the framework for all other furnitures
Finished Destination choosing.