Some fun things
Merge remote-tracking branch 'Dan/master'

Conflicts:
	MartinDatabase/src/edu/ycp/cs320/User/User.java
Added methods to the user class
Just some simple changes
Set up graph classes and the superclass graph
Merge remote-tracking branch 'Dan/master'

Conflicts:
	MartinDatabase/junit/martinComp/FMC/IFMA/modelTest/MemberDataTest.java
	MartinDatabase/junit/martinComp/FMC/IFMA/modelTest/UserTest.java
JUINT test update
Merge remote-tracking branch 'Chad/master'

Conflicts:
	MartinDatabase/junit/martinComp/FMC/IFMA/modelTest/MemberDataTest.java