参加メモ追記した
Merge branch 'source' into 811-majosystems

Conflicts:
	_posts/2014-04-09-event-047.markdown
Merge branch '811-majosystems' into source