今日の日記
Merge remote-tracking branch 'origin/master'

Conflicts:
	2014/08/06/README.md