First commit - shopping cart v1.0
Merge origin/master