New pro
Merge branch 'master' of https://github.com/william57m/projectBrowser

Conflicts:
	projectBrowser.pro.user
ignore file
ignore file 2