commit in local branch
Merge branch 'master' into new_shit

Conflicts:
	cake-recipe.txt
Merge pull request #5 from osized/new_shit

bitch pls