Committing in accordance with the prophecy.
Merge branch 'master' of github.com:devinbrown/graph

Conflicts:
	doc/outline.md