fix
Merge branch 'master' of github.com:mel929210/Project_Uno

Conflicts:
	Project_One.php
	Project_Uno.php
	next/README.md
	next/index.html
	next/index.php
	next/one.php
renaming index.php