Test conflit
test
test
test
test
arg
a
Merge branch 'test' of https://github.com/BUONJG/gittest into test

Conflicts:
	test2.php
a