dev branch commit
dev change 1
This is a local push 1
Commit conflict.
Merge commit 'd9e82a73c2b7bda8877a9dc495a4871ee7608eba' into dev

Conflicts:
	test.php
dev commit 1
local to dev.
dev 2
Merge branch 'master' of https://github.com/truedandyman/test_repository

Conflicts:
	test.php