Added vegetarian options
Merge branch 'master' into vegetarian
Merge branch 'vegetarian'