changed log file
Merge branch 'master' of https://github.com/rolinga85/test

Conflicts:
	Log.txt
new line in nuevo file.txt