debugging conferencing
Merge branch 'master' of github.com:mccainz/hackathon