Dimitris Commit
Merge branch 'master' of github.com:pulse-than/test

Conflicts:
	test2.txt