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!
Pull for you!
Merge pull request #6 from torrmercury/romans-design

Pull for you!
Merge remote-tracking branch 'origin/Johnny!'

Conflicts:
	Frank's Apartment/ProjectSettings/TagManager.asset
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