Randome
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03.git
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03.git

Conflicts:
	.pydevproject
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03.git
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03.git
Fix
Merge remote-tracking branch 'origin/master'
getMeetingNotificationsByUsername
Fixed nullpointerexception
Merge branch 'master' of https://github.com/Gruppe01/EXPHIL03.git
getclient
parse
displaymeetings
Removed meetings
Changed sizes.