working calendar part
remove conflicts 18-jul
Merge pull request #235 from vaibhavcisin274/anshul

Anshul