gestabókarfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Verkefni_Loka/gest.php