name changes
Merge branch 'master' of github.com:larsonkonr/Event-Reporter
get back on same page
renaming