test
index
Merge branch 'master' of https://github.com/uc-pkm/testing.git
checking conflict
create changes in local branch
Merge remote-tracking branch 'origin/local_branch'

Conflicts:
	index.php
	test.php
mearged