Merge pull request #2 from Olyol95/master

Subgroup2
Merge pull request #5 from Olyol95/master

Subgroup2
Merge pull request #13 from Olyol95/Subgroup1

Subgroup1
Merge pull request #14 from Olyol95/Subgroup2

Subgroup2
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
Merge pull request #17 from Olyol95/Subgroup1

cleaned up notes screen, got rid of unnecessary stuff
Merge pull request #18 from Olyol95/master

Subgroup1