Merge branches 'master', 'master' and 'master' of https://github.com/rishabh-g/Shopping-Portal