asd
asd
Merge branch 'master' of https://github.com/Xheradon/FCT.git

Conflicts:
	Controlador/controlador.php