bretyringar
Merge branch 'hogni'

Conflicts:
	verklegtVerkefni.v12.suo
	verklegtVerkefni/Views/Home/Index.cshtml
	verklegtVerkefni/Views/Shared/_Layout.cshtml