version 1.0 without test
organize folder
fixed bug
Merge branch 'master' of https://github.com/niorgai/foodsaid into front-end1.0

Conflicts:
	main.py
code complete
Merge commit 'c57306575afa38861ae6ae7b0c67997329f99680' into front-end1.0

Conflicts:
	main.py
Merge branch 'front-end1.0'

Conflicts:
	main.py