from bairinc0
Merge branch 'master' of https://github.com/bsu-web/conference
Merge branch 'master' of https://github.com/bsu-web/conference