branch test
new_branch_feature
new_branch_feature_2
Merge branch 'feature1'

Conflicts:
	hellogit.c