submodule shower
Merge branch 'master' of github.com:shohoku11wrj/shohoku11wrj.github.com

Conflicts:
	_posts/way/Technology/2014-01-06-slideshow.md