test
Merge branch 'master' of github.com:nullpoga/python-exercises

Conflicts:
	python-exercises