manually merging the gh-pages branch with master.
updating to resolve conflict with gh-pages branch
Merge branch 'gh-pages'
Fixed copy-paste error in ToC menu, added in the styles for the floating nav menu that I forgot when I added the template file.