Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge pull request #21 from Trott/master

left justify logo
Merge branch 'master' into gh-pages
Various text updates. Forgot to make a branch first (doh!)

Conflicts:
	index.md
Merge branch 'master' into gh-pages
More text edits and fixed numbering problem
Merge branch 'master' of https://github.com/ucsf-ckm/bookmarklet into bookmarklet-text-edits-for-clarity

Conflicts:
	index.md
Merge pull request #23 from mizejewski/bookmarklet-text-edits-for-clarity

More text edits and fixed numbering problem
textarea -> pre
Merge branch 'master' into gh-pages
Clarifying steps after testing by Erin
Replaces accidental deletion of header
Clarifying steps after testing by Erin

Conflicts:
	index.md
Replaces accidental deletion of header
Merge branch 'master' into gh-pages
rm former logo
Merge branch 'gh-pages'