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