Slettet Test-filen
nå begynner den jævla mergedriten igjen
Merge branch 'master' of https://github.com/scbasma/Metonix1.0
Merge branch 'master' of https://github.com/scbasma/Metonix1.0

Conflicts:
	src/gui/CallMeetingView.java
	src/modell/MeetingModel.java