new file:   resources.dot
Merge branch 'master' of https://github.com/alemazz/graphs

Conflicts:
	expanded_relationships.dot
	relationships.dot
	resources.dot

	modified:   expanded_relationships.dot
	modified:   relationships.dot
	modified:   resources.dot
	new file:   resources.dot.save