Added pepper to recipe
Fixed conflicts between Sarah's and Alex's commit