deployed site
deployed site
deployed site
deployed site
deployed site
Merge branch 'master' of github.com:jonsterling/blog

Conflicts:
	posts/2013-11-07-psia-chapter-1.markdown
deployed site
deployed site
deployed site
Added ditransitives post
deployed site