Update file2.txt
adam's changes
Merge branch 'v1' of https://github.com/acastruc/test into v1

Conflicts:
	file2.txt
added line at the end
removed last line
Merge branch 'refs/heads/v1-tracked'

Conflicts:
	file2.txt