gitignore funcionando (talvez)
Merge branch 'master' of https://github.com/VictorCarlquist/NaNuvem
Merge branch 'master' of https://github.com/VictorCarlquist/NaNuvem

Conflicts:
	src/application/config/config.php
	src/application/config/database.php
arrumando bagunça do merge
Home carrega planos dinamicamente
Merge branch '3runo5ouza'