adding new conference activity
Merge branch 'master' of https://github.com/alexbrashear/Meditation