Merge branch 'gh-pages' of https://github.com/ucsf-ckm/bookmarklet into gh-pages
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
try disable instead of readonly, doubt it will work, but weirder things have happened
geez
fml
Merge pull request #17 from Trott/gh-pages

try disable because why not