helvítis asp.net user
Merge branch 'master' of https://github.com/LionKingKlubburinn/Translation

Conflicts:
	Controllers/AccountController.cs