edit README.md 2 times
qwertyuiop[
Merge branch 'master' of https://github.com/Frozen2006/shopProject

Conflicts:
	README.md