Merge branch 'style' into posts
minor word change
Merge branch 'style'
Merge branch 'master' into posts
draft
add new site post
remove "teaching" link for now
add nav structure
Merge branch 'master' into style

Conflicts:
	layouts/default.haml
style nav links
add 'alternate' link to header for Atom feed'
add padding to nav
add alternate link for rss+xml, remove nav bar for now