add 'more' tag to default post template'
Merge branch 'master' into posts
draft 1
update post date of 'new site' post
edits
edits
Merge branch 'master' into posts
Merge branch 'master' into posts
Merge branch 'master' into posts
add archive
add grouped article function
limit sidebar to 5 most recent articles
fix heading level
add header to archive
fix archive, restructure nav bars
tweat blockquote colors
Merge branch 'posts'

Conflicts:
	content/archive.haml