ここにコミットログを書く
Merge branch 'master' of https://github.com/bbtuit/sp2014f_testpro3
conflict test