forgot to do this
Merge branch 'master' of https://github.com/codeforamerica/cfa_coder_sounds
Fixing merge conflict.