Push
pushe2
Merge branch 'master' of https://github.com/william57m/projectBrowser

Conflicts:
	mainwindow.cpp
	mainwindow.h