new post
got started on altruism
started on thalia
started on Thalia
first draft of thalia
corrections for thalia post
more on altruism
rewrote altruism
new post
got started on altruism
started on thalia
more on altruism
rewrote altruism
corrections on thalia's post
Merge branch 'thalia' into development

Conflicts:
	_posts/2014-10-12-thalia-my-muse-of-drama.md
Merge branch 'altruism' into development
Merge branch 'development'