for rebase
All static pages html added
Added a list of shipments for each order
Clean up tables
Merge pull request #43 from DavidMMelin/master

We have info!