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

Conflicts:
	a.txt
pridano neco
Merge remote-tracking branch 'remotes/origin/develope'

Conflicts:
	a.txt