be able to run sofa and table
delete lamp
Merge branch 'master' of https://github.com/Nasakol/RoomGL

Conflicts:
	RoomGL/room.cpp