put credits in separate file, and include it
merge in two-tier nav
merge conflicts...
Merge branch 'master' of github.com:sc3/cook-convictions
update location hash bashed on position on the page
Merge pull request #80 from bepetersn/hash-change-with-scrolling

Hash change with scrolling