merging edit and create event modals into one
Merge branch 'master' of https://github.com/jgoldsmith613/newProject