master README.md 1
master README.md 2
master README.md 3
develop README.md 1

Conflicts:
	README.md
develop dev.php 1
Merge branch 'develop' of github.com:xtoybsx/practice into develop

Conflicts:
	README.md