yo
Merge branch 'master' of github.com:hronn13/verklegtVerkefni

Conflicts:
	verklegtVerkefni/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of github.com:hronn13/verklegtVerkefni