otherbranch commit
Merge branch 'master' of https://github.com/jmakenney/testrepo.git into
mybranch

Conflicts:
	newfile.php