Update 2014-01-22-event-036.markdown
Merge branch '592-fujioenoki'

Conflicts:
	_posts/2014-01-22-event-036.markdown