Some changes
Merge branch 'master' of github.com:gilas/shop