Merge pull request #29 from kelesidis/Chris

Chris
Cart Update
Merge pull request #30 from kelesidis/Antonis

Cart Update