**************commit for merge test
Merge branch 'master' of https://github.com/tmlingam/projecta