exchange coconut oil for vegetable oil.
Merge branch 'master' into different-oil

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

exchange coconut oil for vegetable oil.