adds
edits
edits
Merge branch 'master' of https://github.com/masashi0127/python