added testBranch method
Merge branch 'first-branch'

Conflicts:
	index.php