SANNADU TAD
vektu mig
asdfasdfMerge branch 'master' of https://github.com/ivar84/Verk5IvarLogiSindri

Conflicts:
	verk5/verk5/Scripts/IndexCntrlr.js
	verk5/verk5/Views/Home/Index.cshtml