test commit2
fix merge conflict
more conflict resolution
Merge branch 'emily' of https://github.com/DSynergy/Event_Reporter into emily
Merge branch 'master' into emily
added load file and print commands