Self Rel Fixes
Merge branch 'master' of https://github.com/nateener/teamPlusPlus

Conflicts:
	UML Editor/bin/.gitignore
	UML Editor/bin/Relationship.class