added upcoming events to the home page
removed a forward slash breaks a page while switching from about to home page
Merged in master and resolved conflict.
Merge pull request #141 from drewww/upcoming-events

added upcoming events to the home page