edit file test.txt
Merge branch 'master' of https://github.com/freesalevn/skillmap

Conflicts:
	test.txt