getting sick of this
broke it on gh branch
updated everything on the master branch
Merge branch 'master' into gh-pages