Merge branch 'master' of github.com:AnthonyReid99/VisualGit into canvas

Conflicts:
	src/main.py
Merge branch 'canvas' of github.com:AnthonyReid99/VisualGit into canvas
Merge branch 'canvas' of github.com:AnthonyReid99/VisualGit into canvas

Conflicts:
	src/main.py