fixed you died thing
making master  and github pages branch the same hierarchy
Merge branch 'master' into gh-pages