changes
Merge branch 'master' of github.com:mariusdanciu/shop
udpated