timing sucks
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	CS 2420 - Summer 2014/src/assignment7/GraphUtilTimer.java
Merge remote-tracking branch 'origin/master'
update