まーじしていくで
Merge commit '8a16389ddc76e7221e640f471f4c9c00a1b51d54'

Conflicts:
	kin_mu/app/assets/stylesheets/show.css