working on calendar
remove conflicts 17-jul
Merge pull request #227 from vaibhavcisin274/anshul

Anshul