Folder
hello
hello
Hello msg
Merge branch 'master' of https://github.com/urosjarc/testing

Conflicts:
	testfolder/folder_fiel