pushing before pulling
conflict reolved
upstream merged to origin
Merge pull request #6 from sachin87/master

conflict resolved.