{
  "default": "https://github.com/codeforamerica/cfa_coder_sounds/raw/master/sounds/hawk.mp3",
  "atogle": "https://github.com/codeforamerica/cfa_coder_sounds/raw/master/sounds/megaman2_boss.mp3",
  "andycochran": "http://www.soundjay.com/misc/sounds/wind-chime-1.mp3",
  "fkh": "https://dl.dropbox.com/u/16744353/Boing.m4a",
  "slinkp": "http://slinkp.com/~paul/github_commithook_ponyexpress.mp3"
}

{
  "default": "https://dl.dropbox.com/u/16744353/Temple.m4a",
  "atogle": "https://github.com/codeforamerica/cfa_coder_sounds/raw/master/sounds/megaman2_boss.mp3",
  "andycochran": "http://www.soundjay.com/misc/sounds/wind-chime-1.mp3",
  "fkh": "https://dl.dropbox.com/u/16744353/Boing.m4a",
  "slinkp": "http://slinkp.com/~paul/github_commithook_ponyexpress.mp3",
  "jeffmaki": "http://www.subwaynut.com/sounds/6line/thenextstopishuntspointav.mp3",
  "mjumbewu": "https://github.com/codeforamerica/cfa_coder_sounds/raw/master/sounds/golden_ticket.mp3"
}

Add slinkp; resolve merge conflict
Add slinkp; resolve merge conflict
