Merge branch 'master' of github.com:ilyabo/gen-hackday

Conflicts:
	site/index.html