adapted to take in new graphs
Merge branch 'master' of https://github.com/knathanieltucker/project

Conflicts:
	Code/constriant_network.py
asdf