Complete testing
Merge branch 'master' of https://github.com/ricksmt/CS456.git

Conflicts:
	README.md
	src/NetworkModel.java