upando no ftp
Merge branch 'master' of https://github.com/alainmcf/em5passos

Conflicts:
	.project
	inc/classe_ajudante.php
	inc/css/formatacao_gc.css
	inc/js/java_script.js