SQASHED!
Merge branch 'dev' of https://github.com/Involve-Seattle/Activity-Calendar into bugsquash
Merge pull request #38 from Involve-Seattle/bugsquash

Bugsquash