add sum
add minus
add feature1
change1
change1
change2
Merge branch 'feature1'
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	scenario1/main.cpp
fix bug1
fix bug again