Revert "菊の追加"

This reverts commit bdb06e8090d787a328275df0d7b7680408eba8b0.
Merge branch 'master' of github.com:skizi/test2014_11_28