local changes
Merge branch 'gh-pages' of github.com:jpfr/instant-presentation into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of github.com:jpfr/instant-presentation into gh-pages

Conflicts:
	keyword2image.js
	style.css