t
Merge branch 'master' of https://github.com/fabianoa/iad

Conflicts:
	app/preparadorDeDados.R
Merge branch 'master' of https://github.com/fabianoa/iad

Conflicts:
	app/preparadorDeDados.R