Link
Merge remote-tracking branch 'origin/master'

Conflicts:
	VerklegtVerkefni3.pro.user