Merge branch 'gh-pages'
Merge branch 'working-copy' into gh-pages
Merge branch 'gh-pages'
adding updates and research
Merge branch 'master' into working-copy