Merge branch 'master' of github.com:great-h/great-h.github.io into moriC
Merge branch 'master' of github.com:great-h/great-h.github.io into moriC
#277 Octopressなるものを入れてみる
Merge branch 'moriC'

Conflicts:
	_posts/2013-9-25-event-019.markdown