Enhanced GUI-Logic #3 #4
Merge branch 'master' of https://github.com/ironmen-swp/timetable