fu
fu
halfviti
Merge branch 'master' of github.com:halldorel/hv1

Conflicts:
	fjarinn.html