Modified project to be more MVC. Fixed code after adjustment. Copied Tony's additions to the project.
Making changes to the structure again, fixed issues. Should be
incorporated with Tony's changes as well.

Conflicts:
	gui/CanvasView.py
	gui/mainGui.py