keep writing
Merge branch 'master' of https://github.com/nathanleclaire/blog

Conflicts:
	source/_posts/2013-11-04-want-to-work-with-databases-in-golang-lets-try-some-gorp.markdown