reminder to wash dishes
Merge branch 'master' of https://github.com/ypeussa/vcs-testing

Conflicts:
	pancake recipe.txt