test
Merge branch 'master' of https://github.com/T-G-P/Friendship-Graph

Conflicts:
	Graph.java
Test