Merge branch 'gh-pages'
Merge branch 'master' of github.com:ucsf-ckm/bookmarklet
Merge pull request #16 from ucsf-ckm/master

Merge already, will ya?
Merge branch 'gh-pages' of https://github.com/ucsf-ckm/bookmarklet into gh-pages