why
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
ok
fixed merge conflicts
fixed app merge conflicts
pre subscriptions
subscriptions fixed merge
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
Merge branch 'master' of github.com:Eventalist/Eventalist into theerickramer
fixed subscribe
Merge pull request #40 from Eventalist/theerickramer

Theerickramer
Fixed merge conflict