fixed conflict message
fixed typo
Merge pull request #15 from felamaslen/fela_js

fixed typo and conflict message