event block
fixed merge conflict
Merge pull request #19 from crotten/master

Got the event block to only show events that have not happened