commiting the bugs after fixing
Merge branch 'master' of https://github.com/harikrishna266/social