Changing peppers
Merge branch 'master' of github.com:JMF2012/grocerylist

Conflicts:
	index.html