Added pasta salad
Merge branch 'master' into vegetarian
Merge branch 'vegetarian'
Merge pull request #2 from arkore/master

Merge to keep up to date