gh-pages
Merge branch 'master' of https://github.com/alfg/jot into gh-pages

Conflicts:
	README.md
	index.html
Merge branch 'master' of https://github.com/alfg/jot into gh-pages
Merge branch 'master' of https://github.com/alfg/jot into gh-pages
Merge branch 'master' of https://github.com/alfg/jot into gh-pages
Merge branch 'master' of https://github.com/alfg/jot into gh-pages
Merge branch 'master' of https://github.com/alfg/jot into gh-pages
Merge branch 'master' of https://github.com/alfg/jot into gh-pages
GA
Merge branch 'gh-pages' of github.com:alfg/jot into gh-pages
Merge branch 'master' of github.com:alfg/jot into gh-pages
Merge branch 'master' of github.com:alfg/jot into gh-pages
Merge remote-tracking branch 'origin/master' into gh-pages
Typo
Update blowfish lib.
Merge branch 'gh-pages' of github.com:alfg/jot into gh-pages

Conflicts:
	README.md
Delete hexBase64.js.