Added in the JUNIT test class for USER!
Added in the method for testing for User at the end of that class
Merge branch 'master' of https://github.com/kngrace/Conferences.git

Conflicts:
	Conferences/.classpath
	Conferences/src/model/User.java
Updating user locally