Merge branch 'gh-pages'
fixed it in localhost. testing live
Merge branch 'master' into gh-pages