Add second line.
Merge branch 'develope' of github.com:kennyhack/myproject into develope

Conflicts:
	a.txt