blabla
Merge remote-tracking branch 'INF1000/master'

Conflicts:
	olje/Selskap.class