歧义

第一反应是循环包含.
Merge remote-tracking branch 'upstream/master'
merge with upstream
merge with upstream
removed rvm config file
update readme
update readme
Merge pull request #1 from turristan/master

Just another pull request