Add paprika
Merge remote-tracking branch 'origin/master'

Conflicts:
	chili-recipe.txt
Change vegetable oil to canola
Merge branch 'master' of https://github.com/pjsteenwerth/recipes into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from pjsteenwerth/different-oil

Different oil