merge
Updated .gitignore to ignore test repo
merge
commit before merge. slight tweaks
ending this madness. Going back to main ui branch
Stable version. UpdateInfoWindow should work. ready for merge to master.
Merged origin/canvasUI into canvasUI
Cleaned up canvas object code

Removed extra whitespace and organized imports on all canvas
objects
Added various logging statements

Fixed minor bug
Trivial edits to fix git problem
Merged repo_parser into canvasUI
Improved branch label rendering

Branch labels now automatically render during rendering of canvas, and
appear to the left of their commit. Eventually they will probably be
more smart about where to place themselves. Still no lines.
Added slot to receive a signal

Added slot to receive a signal indicating that the scene should be
redrawn since the files have changed.
Implemented basic lines for branch labels

Lines currently do not refresh when labels are moved, and do not
properly attach
Merge remote-tracking branch 'origin/canvasUI' into kahmali_ui

Conflicts:
	ggraphicsscene.cpp
	mainwindow.ui
Added signal for refreshing canvas from MainWindow

- Added to refresh button in toolbar. Tested and working.