Slettet DB-tutorialgreia
Merge branch 'master' of https://github.com/Pepsinator/SU
Merge branch 'master' of https://github.com/Pepsinator/SU
Merge branch 'master' of https://github.com/Pepsinator/SU
småfiks
Merge branch 'master' of https://github.com/Pepsinator/SU
Alarm tilegg del 1
alarm
Merge branch 'master' of https://github.com/Pepsinator/SU

Conflicts:
	database.properties