more content
merging @edsu's pull request w/hackathon details
Merge branch 'master' of github.com:dchud/talks
complete draft