Merge branch 'work-slideshow'
Merge branch 'master' of https://github.com/davidpaulsson/davidpaulsson.se