Uploaded everything
Merge branch 'master' of https://github.com/FranciscoP/UserManager

Conflicts:
	README.md
	config.php