my first commit
Merge branch 'master' of https://github.com/shoshanna/team_practice
Merge branch 'master' of https://github.com/shoshanna/team_practice