Merge branch 'master' of github.com:cameronbwhite/acm.pdx.edu
Merge branch 'master' of github.com:pdxacm/acm.pdx.edu
Fix duplicate event entries 2014-02-28