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
Put in Floor and Carpet, created ‘Room Elements’ folder
Merge branch 'master' of https://github.com/torrmercury/GlobalGameJam2014

# Via Roman (2) and torrmercury (1)
* 'master' of https://github.com/torrmercury/GlobalGameJam2014:
  created the Roman scene
  Started creating Bedroom

Conflicts:
	Frank's Apartment/Assets/Images/Floor.png.meta
	Frank's Apartment/Assets/Images/Materials/Floor.mat
	Frank's Apartment/Assets/Images/Materials/Floor.mat.meta
	Frank's Apartment/Assets/Scenes/Roman.unity
Changed All game objects to sprites, restarted bedroom and put in walls and floor
Created more walls and Room elements, TV
Added coach
Merge pull request #5 from torrmercury/romans-design

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

Johnny!
Merge branch 'master' into Matt

Conflicts:
	Frank's Apartment/Frank's Apartment.userprefs