ok
Merge branch 'master' of github.com:master83/test
 know just commit it
Conflicts:
	myfile.html