Test na konflikt
Merge remote-tracking branch 'origin/master'

Conflicts:
	Don't NET App.txt