added a new line while on master branch
added new line
added another line
Merge branch 'feature' of github.com:unomateo/rebase-test into feature

Conflicts:
	test.txt