changed test.txt
Merge branch 'master' of github.com:victormejia/project

Conflicts:
	test.txt