working on client part
remove conflicts
Merge pull request #452 from vaibhavcisin274/anshul

Anshul