Gave functions definitions
removed merge conflicts
Merge branch 'master' of github.com:damianialex/python_hw3