All event tests should run now
Merge branch 'devDan' into dev
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev