working on logs projects
remove conflicts 16-jul
remove conflicts 17-jul
Merge pull request #220 from vaibhavcisin274/anshul

Anshul