My initial commit message
Merge branch 'master' of https://github.com/nelly-hateva/online-shop