master readme: add "2"
Second merge, w/ updated master readme
Merge branch 'master' into gh-pages