Commit initial files
Merge branch 'master' of https://github.com/dasigr/laravelcommerce
Resolve conflicts