Minor edits
updating makefile
Merge branch 'origin/master'

Conflicts:
	Makefile
	mainwindow.pro
Merge branch 'origin/master'

Conflicts:
	Makefile