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

Conflicts:
	README