Revert "Merge branch 'master' of https://github.com/teamcodeforfood/codecamp13"

Conflicts:
	main.py
Merge branch 'master' of https://github.com/teamcodeforfood/codecamp13

This reverts commit 710d5bf90ed9769ecf54ec174ea89e52f1346dd6, reversing
changes made to b02ac01b7b85ec25fbe7a4078fd850b7fc9c106e.