hope this merge goes well
hi
Merge branch 'master' of https://github.com/k8wells/452p1

Conflicts:
	p1gui/canvas.h
	p1gui/mainwindow.cpp
	p1gui/p1gui.pro.user
Merging like a boss