Merge pull request #11 from adapt/feature/checkout

Work on the checkout process
Merge branch 'master' into feature/checkout