pre-merge
Merge branch 'master' of http://github.com/mnolan2/GraphKit

Conflicts:
	Graph.m