merge
fixed merge
more conflict resolution
Merge branch 'emily' of https://github.com/DSynergy/Event_Reporter into emily