Updated Event and homepage
Merge branch 'master' of https://github.com/gggonzales/CMC