Updated GUI code and documentation
Resolve merge conflict
Merge branch 'master' of https://github.com/ElPenguino/ExamScheduler