initial commit
Merge https://github.com/mariannemyers/conference-data