Allergies added
Merge branch 'master' into inanDev

Conflicts:
	views/index.ejs
Allergy completed
Altered food schema