Merge pull request #1 from sachin87/master

user search functionality added
pushing before pulling
conlict reolved