init commit
2nd modify
3rd
hello
helloworld 수정
dididid
lllllamending test
feature 1 implement
master implement
feature2
Merge branch 'feature2'
feature1-2
Merge branch 'feature1'
feature1-3
master
Merge branch 'feature1'

Conflicts:
	HelloWorld.txt
master feature development
newFeature
newfeater2
Merge remote-tracking branch 'origin/master' into newFeature