Intergration fix
Merge branch 'master' of git@github.com:Vistritium/Supermarket.git