Merge branch 'master' of https://github.com/urosjarc/testing

Conflicts:
	data2.txt
Merge branch 'master' of https://github.com/urosjarc/testing

Conflicts:
	data2.txt