Still trying to fix image size issues
Merge branch 'master' of https://github.com/george2/barter