some stuff
Merge branch 'master' of https://github.com/gramasaurous/pa4

Conflicts:
	Graph.c