solved CONFLICT
Merge pull request #17 from ICTKyouikukei2013/new_branch_name

solved CONFLICT