play
Merge branch 'master' of https://github.com/wilifabrizio/tsp

Conflicts:
	api/private/registro.php