final changes by mike
Merge branch 'master' of https://github.com/mikeislearning/barterful