moved our things back into the header, made past and upcoming events parts
Merge pull request #12 from ausesa/update-events

moved our things back into the header, made past and upcoming events parts