Other commit
A new commit
Updates
Merge branch 'test1' of github.com:ignaciojonas/testrebase into test1

Conflicts:
	other.txt
	test.txt
	test.txt~