修正01
Merge branch 'master' of annonay.itolab.nitech.ac.jp:em_simulator
change gitignore
Merge branch 'dev' of https://github.com/yshtak/em_simulator
一部修正