Readme with string replacement, sorry
Merge pull request #11 from renoirb/master

Bumping version number, compiling javascript
Merge conflict fix