running it with puma!
Merge remote-tracking branch 'origin/master'

# By sufish
# Via sufish
* origin/master:
  Update README.md
  Update README.md
  Update and rename README.rdoc to README.md