Second commit
Merge branch 'master' of https://github.com/glisto18/team_python