Merging With Master
Some Style changes.
Merge branch 'master' of https://github.com/gvarun22/E-MART