everything working(I think)
Merge branch 'master' of github.com:jerold/CI-Project-3

Conflicts:
	Network.py