einhver hálfkláruð súpa síðan í gær
Merge branch 'master' of https://github.com/LionKingKlubburinn/Translation

Conflicts:
	Views/Home/Index.cshtml
	Views/Translation/Index.cshtml
Merge branch 'master' of https://github.com/LionKingKlubburinn/Translation