Merge conflicts.
Merge branch 'order-entry' of https://github.com/shipstation/gitdemo into order-entry
Add delete item button.
Merge branch 'order-entry' of https://github.com/shipstation/gitdemo into order-entry