fulfilled request for changes in type
more work on basket
Merge branch 'gh-pages' of github.com:albumprinter/arc into gh-pages