Added order history
editing mainCartCtrl.js
Troubleshooting @line_items
resolved merge conflicts
Troublshooting LineItemsController
ready to sync