use margarine in place of butter
Merge branch 'master' into different-vegan

Conflicts:
	cake-recipe-vegan.txt
Merge pull request #1 from yednaps/different-vegan

use margarine in place of butter