Finished most of the cart
Merge branch 'master' of https://github.com/WatchWeb/Project