pitchperfect/ipitchperfect — pull request #17 by areagray (2014-08-01 22:56:44+00:00)
Title: Conflict/cg1

resolved it