branch test
branch add ver file
Merge branch 'test1'

Conflicts:
	index.php
	ver.php