stuff
Merge branch 'N-1-Næst-Bestu' of https://github.com/gudmundurmar/SKSKG into N-1-Næst-Bestu

Conflicts:
	v3/verk3.py