Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.xml

Merge remote-tracking branch
'origin/master'

Conflicts:
	nbproject/private/private.xml

Private - netbeans project
Merge branch 'master' of https://github.com/Axnct/Software-Geo-testes

Conflicts:
	public_html/css/styles.css
	public_html/relatorios.html