Merge pull request #15 from Olyol95/master

subgroup3
Graphical changes to appointment screen, started work on calendar
Merge pull request #16 from Olyol95/Subgroup3

Subgroup3