trying to fix api-events
Merge branch 'master' of https://github.com/alfredababio/wedding-crashers
Merge branch 'master' of https://github.com/alfredababio/wedding-crashers
back end functional
fixing merge conflicts