<croping works better>
Merge branch 'master' of https://github.com/jthogan/GUIGt

Conflicts:
	Prog1_GUI.pro.user