Scrolling in DayView working, still need to work on DayTableViewController
merge conflict