as before but on the master branch
deleting other ideasMerge branch 'gh-pages'
fixed navbar differences between pages (i've also cleaned up out filing system slightly)
merged master with gh-pages