2B
3C
3C
story long story
d3 modify
Merge branch 'feature/3long_storry' into develop

Conflicts:
	txt/3.txt