Test today's events
Added getTodaysEvents functionality.
Fixed merge conflict