fixed errors
Mer"remote merge"
ge branch 'master' of https://github.com/jainnidhi/smartshop-basic