fixed some bugs and worked on integration
trying to get the movement to work
.pro.user file is annoying
Merge branch 'Hey-y'all!-I'm-a-new-branch!' of https://github.com/k8wells/452p1 into Hey-y'all!-I'm-a-new-branch!
SuperMagical Merge branch 'moveFix' done in 5 minutes, so if there
is something that is not magic, feel free to fix it.

Conflicts:
	p1gui/canvas.cpp
	p1gui/canvas.h
	p1gui/mainwindow.cpp