commit shop
Merge branch 'master' of github.com:Konro1/fuelshop

Conflicts:
	README.md