Signed-off-by: Devid <devid.solymosi@webapix.hu>
Merge branch 'master' of https://github.com/sdevid/test

Conflicts:
	test.txt