add 2 files
Merge branch 'master' into gh-pages