Initial commit of calendar
Resolved conflict in package.json