working on to do list
remove conflicts
Merge pull request #412 from vaibhavcisin274/anshul

Anshul