my first commit
changing to be more event specific to compcon
Merge branch 'master' of github.com:elena/talk-example