commit myform.php
Merge branch 'master' of https://github.com/fsajp/testdir

Conflicts:
	myform.php