Steg 2 vecka 5
Merge branch 'master' of https://github.com/klambycom/klambycom.github.com