modified:   directory.cpp
	modified:   directory.h
Merge branch 'master' of github.com:Dibel/3D-Explorer

Conflicts:
	directory.cpp