Merge branch 'master' into gh-pages

Conflicts:
	css/julekuler.css
	css/julekuler.css~
	index.html
	index.html~
	js/julekuler.js
	js/julekuler.js~
Merge branch 'gh-pages' of https://github.com/derwassi/julekuler-generator into gh-pages