merge
Merge branch 'master' of github.com:coolshine-coder/file_browser

Conflicts:
	listtest.cpp
	listtest.h