start making navigation
Merge pull request #7 from mirthbottle/master

add and fix formatting of posts
Merge branch 'gh-pages' into add_nav
added nav filenames
Merge branch 'master' into add_nav
put back CNAME file
Merge branch 'master' of https://github.com/cwBerkeley/cwberkeley.github.io
fix config maybe
delete from git ignore
change permalink back
edit for local staging
Merge branch 'add_nav' into gh-pages