updated associations
fixed merge
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
whatever
something
mailgun
Merge pull request #29 from Eventalist/theerickramer

Theerickramer