almost working, I think
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!
Adding some debug statement, I will merge to branch to master to not have two versions
Merge branch 'moveFix'

Conflicts:
	p1gui/canvas.cpp