this file just doesn't want to go away
Merge branch 'master' of https://github.com/Eventifi/Eventifi