Full commit
Merge branch 'master' of https://github.com/Jonty800/Shopper.App