merged from all
Merge branch 'master' of github.com:cmci/saiboukougaku