undo last commit
Merge branch 'master' of github.com:dioscouri/f3-shop