track commit 1

Track commit 2

Track commit 3
Merge branch 'master' of github.com:andou/lovegit

Conflicts:
	prova/file.test