Merge branch 'master' into gh-pages
updated version
Merge branch 'gh-pages' of https://github.com/derwassi/julekuler-generator into gh-pages