pulled from origin
added whitespace
removed text
added mac text
added mactext to span
added cherrypick
cherrypick commit
Merge branch 'gh-pages'
added some text
commit