asd
Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester

Conflicts:
	.gitignore