stuff again
Merge branch 'develop' of https://github.com/pmitche/it2805-project into develop
Fix specific event parsing
Merge branch 'develop' of https://github.com/pmitche/it2805-project into develop