add a copy
Merge branch 'master' of https://github.com/sfs1331/NewProject

Conflicts:
	index.php