room

done
Merge remote-tracking branch 'origin/master'

Conflicts:
	TheLastOne.gmx/objects/obj_stair_1.object.gmx
	TheLastOne.gmx/objects/obj_stair_2.object.gmx
	TheLastOne.gmx/objects/obj_stair_3.object.gmx
	TheLastOne.gmx/objects/obj_stair_4.object.gmx
	TheLastOne.gmx/objects/obj_stair_5.object.gmx
	TheLastOne.gmx/objects/obj_stair_6.object.gmx