working collage.
Merge branch 'alt' of https://github.com/tjvaneerten/PocketShop into alt