updated config file
Merge branch 'master' into gh-pages
updates
merge