First commit
Merge branch 'master' of https://github.com/Kimoja/jocode_slideshow.git