merged
Merge branch 'master' of github.com:tattooist/react-shop