Merge pull request #4 from Chenyijun/master

asdfsdfadsf
input form save to pull
edit input form to pull
Merge pull request #5 from sanghal/master

kjkjh
input form for merge conflict
added food in populate file and added alphabetical scope in food
Merge pull request #4 from maggieli321/master

merging