styling
fixing conflict
added an expanded calendar component
Merge pull request #44 from wgallop99/calendar_expand

Calendar expand