Plesse enter the commit message for your changes. Lines starting
gos
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	core
	sistema/controladores/usuarios.php
assd