changes pizza
Merge branch 'master' of github.com:strex/test

Conflicts:
	food.txt