Update README.
Merge branch 'master' of github.com:stefanneculai/wysiwyg-rails