commit by userB
Merge branch 'master' of https://github.com/tmlingam/projecta