User.java and Manager.java functions have been updated and tested in the FinalProject.java.  They should work fine.
Merge branch 'master' of https://github.com/EchoSource/cmpsc221-final.git