chan ges is feature two
changed in master
Merge branch 'feature/two'

Conflicts:
	Falx/added_one.txt
commit feature three
master commit
Merge branch 'feature/three'

Conflicts:
	Falx/added_one.txt
Rezolvat.