Changes file function.php
Merge branch 'master' of https://github.com/nosolored/members-management into nosolored-master

Conflicts:
	.gitignore
	funciones.php
Idea
Merge branch 'nosolored-master'