[TST-1] Add some changes in "other"-branch
[TST-1] Add some changes in "my_branch"
Merge branch 'other' into my_branch

Conflicts:
	README
TCC-1 Resolve conflict