fixed conflicts
Merge branch 'master' of
https://github.com/axl411/E-Commerce-Demo-Site.git