mudei config
Merge branch 'master' of github.com:zrhans/dadosatmosfericos.org

Conflicts:
	web/config.php
Merge branch 'master' of github.com:zrhans/dadosatmosfericos.org

Conflicts:
	web/config.php