war
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-11-21-this-war-of-mine.md