fixed merge conflict
Merge pull request #10 from chorus-frogs-2014/fix-conflicts

fixed merge conflict