started checkout logic and added styling to site
fixed merge conflict