Merge branch 'master' of https://github.com/JerryZendy/Perfis

Conflicts:
	index.php