GUI update
Merge branch 'master' of https://github.com/Live-Oak/FlipKartProject.git