7
final
Merge branch 'master' of github.com:davline/repo2

Conflicts:
	newfile3