move config file to root
Merge branch 'master' into gh-pages
URL Change
Merge branch 'master' into gh-pages