Deleting file to remove merge conflicts
Merge branch 'wwu_branch'
"Updating SocialNetwork.Java"
Updating SocialNetwork.java
Adding SocialNetwork.java
experimenting.
Merge branch 'master' of github.com:Jtosbornex/SocialNetwork
"making sure all repos are up to date"
Merge branch 'master' into wwu_edit

Conflicts:
	SocialNetwork.java