First commit in new branch
Update test.php
new version
Update test.php
conflict
merged
Update test.php
blah
Merge branch 'test_phase2' of https://github.com/fcestari/test into test_phase2
Merge branch 'new_branch'

Conflicts:
	test2.php