add checkout button
checkout form
fix merge issues
t push origin masterMerge branch 'steph_tuesday'

:wq