modified files for git commit
Merge branch 'master' of https://github.com/tmlingam/projecta