Merge branch 'master' of https://github.com/abhidditpro2009/RealMashupFinal into priyanka
pushing cosmetic changes
merging conflicts with master
Merge pull request #38 from abhidditpro2009/priyanka

Priyanka