Updated events page for upcoming events
Updated header to reflect actual upcoming event.
Merge branch 'master' into gh-pages