foo
Merge branch 'develop' of github.com:jasonbrooks/aweblog into develop

Conflicts:
	archive/2013-06-16-Second.adoc

foo
Merge branch 'develop' of github.com:jasonbrooks/aweblog into develop
foo