test
Merge branch 'master' of github.com:Dibel/3D-Explorer

Conflicts:
	config/room1.conf