add feature1 line
update the feature1 text
add one line on branch master
conflict fixed
add hello.go
merge hello.go from dev
fix bug of issue-100
dev add hello.rb