main 3_1
main 2_1
main 1_1
main 2_1
Merge branch 'master' into feature1
Merge branch 'master' into feature2
Merge branch 'master' into feature3

Conflicts:
	main.txt
Merge branch 'feature2' into develop
Merge branch 'feature3' into develop