简单翻译一句测试下
Merge pull request #1 from seveniruby/master

简单翻译一句测试下
'增加中文翻译'
去掉英文原文
改进版式
增加更新说明
Merge pull request #2 from seveniruby/master

翻译了windows上安装运行appium的文档
Merge branch 'master' of github.com:appium/appium
update the mobile-web cn docs
add chinese docs and a ruby xunit testcase sample for android
Merge branch 'master' of github.com:testerhome/appium
merge the testerhome/appium master
update the caps.cn.md as the lastest docs
Add the Real Device cn md file
Merge branch 'master' of github.com:testerhome/appium

Conflicts:
	sample-code/examples/ruby/xunit_android.rb
Merge pull request #15 from monkeytest15/master

update caps.cn.md and real-device.cn.md file