Merge branch 'master' of https://github.com/ikageso1/sample1

Conflicts:
hogehoge.cpp