Resolved merge conflicts
Fixed issue with overflowing event text
Update DayView.js
Merge pull request #33 from awwest/development

Fixed issue with event text overflow