Cancel it
Merge branch 'RonnieGUI_statisk_oppdateringsmetoder_forever' of https://github.com/snorheim/DAT210G into RonnieGUI_statisk_oppdateringsmetoder_forever

Conflicts:
	DAT210G/pictureDB.db