bjo til skjal
:
let inn skrar
Merge branch 'master' of https://github.com/lenadis/lenadis.github.io

Conflicts:
	index.html