finishing off number 2
Merge branch 'master' of https://github.com/nkosi91/python_project2014