test4
Merge branch 'master' of https://github.com/miki-tsssw/test.git

Conflicts:
	folder1/test.php