Final changes. No good name.
Merge branch 'master' of https://github.com/warreq/AdventureXP

Conflicts:

Program/src/main/java/edu/kea/adventureXP/presenter/ManageInstructorPres
enter.java