Updated javadocs
Merge branch 'master' of https://github.com/rharris2825/School-Manager