Merge pull request #151 from amida-tech/mcFriday

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

allergies merge ui done
Merge branch 'master' into mcFriday
Reactions more functional.