Started creating some tests
Merge branch 'master' of github.com:damianialex/python_hw2

Conflicts:
	amazon.py