exemplo
saas
Merge remote-tracking branch 'upstream/master'
platform
Merge branch 'master' of https://github.com/pdlima/aula-vx-git

Conflicts:
	config.xml
	index.html