Merge branch 'master' of https://github.com/EkapopSan/cakeShop

Conflicts:
	README.md