Merge pull request #41 from deebost/master

commit
save before pull
Merge pull request #42 from deebost/master

made color category
Merge remote-tracking branch 'origin/master' into MorePlists
great stuff
Merge pull request #43 from deebost/master

border allergen button