Revert "Merge branch 'master' of https://github.com/Hiroshi-Ito/jk2014"

This reverts commit 7d082e4bf5936c6e12566f323abc4811b18ff1b7, reversing
changes made to 236d6d664de6f0af07db473becf55e64a5a4a671.
Revert "etc."

This reverts commit 236d6d664de6f0af07db473becf55e64a5a4a671.