allergies merge ui done
Merge pull request #152 from amida-tech/its-fridaay

allergies merge ui done