Updated some functions and added some functions.
Merge branch 'master' of https://github.com/University-Management-And-Scheduling/UMAS-Project.git
Removed some locations