Merge branch 'master' of https://github.com/nielsrasmus/nielsrasmus.github.io

Conflicts:
.DS_Store
Er jpg ændret