no need to commit
Merge branch 'master' of https://github.com/maktrix16/ecommerce_dojo
arthurs latest version for Tue combining Kelly's