Updated virtual dorm room
Resolved merge conflict

Conflicts:
	themes/sustainabilityold/templates/Layout/LivingSpacePage.ss