我只是想把新代码pull下来
Merge branch 'master' of https://github.com/Leongum/ExRunner

Conflicts:
	RevolUtioN.xcodeproj/project.pbxproj
	RevolUtioN.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	RevolUtioN/RORLoginViewController.m
	RevolUtioN/RORPublicMethods.m