add of feature1
master modify
conflict fixed
Ruby复习资料--Ruby's materials
add file of list ignore files
platform