in progress login options forward to checkout
fixed conficts
Merge pull request #19 from wvmitchell/review_your_order

Review your order