endret linje 3
Merge branch 'master' of https://github.com/jsunborn/4sem-fellesprosjekt

Conflicts:
	DB2/calendarScript