updated the testing files
Merge remote-tracking branch 'upstream/software-testing' into software-testing

Conflicts:
	src/app/Cli.java
	src/test/integrate/ViewSubjectiveNetwork.java
	src/test/integrate/ViewTrustNetwork.java
Merge pull request #20 from salter31/software-testing

Finished network viewing tests and added negative result