Updated
Merge branch 'master' of https://github.com/kngrace/Conferences.git
Merge branch 'master' of https://github.com/kngrace/Conferences.git
Merge branch 'master' of https://github.com/kngrace/Conferences.git
Merge branch 'master' of https://github.com/kngrace/Conferences.git
All kinds of new stuff