branch test
premerge
fixed merge conflict
eric fixed his shit
Merge branch 'master' of github.com:Eventalist/Eventalist