No changes, just added comments to make sure I understand what is going on
Added .uniq to @events in the EventController to avoid duplication in the view
Create db structure for events to have dates
Write method to add event_date to event when the event is initialized from Event.more
Write nice_format method for EventDate class
Pass @dates in the events controller
Modify index.erb to organize the information by date
Change Event.more to pull events based on current time instead of hard-coded time
Merge conflicts resolved
Small style changes
Moved Time.now to App so it fires once when the app starts
More style changes