Made errors go away for unfinished code. (commented out)
Changed Metafile and asset serialization options to create git flow
Merge pull request #2 from torrmercury/Matt

Changed Metafile and asset serialization options to create git flow
Started creating Bedroom
Merge branch 'master' into romans-design

* master:
  Changed Metafile and asset serialization options to create git flow

Conflicts:
	Frank's Apartment/Assets/Scenes/test scene.unity
created the Roman scene
Merge pull request #3 from torrmercury/romans-design

Romans design
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