Merge pull request #28 from abhidditpro2009/priyanka

merging backend(abhijeet) with frontend(priyanka)
Merge branch 'master' of https://github.com/abhidditpro2009/RealMashupFinal into priyanka
cosmetic changes in  all pages