Fixed/Added links and error messages
Added newest carts and reviews
Fixed merge issues
Merge pull request #20 from stuycs-softdev/vivian

Vivian
Edit templates
Edit templates, fix merge error