Atualizacao do App
Merge branch 'master' of https://github.com/fdolzanes1/KiCombUp into Cont

Conflicts:
	.gitignore
Merge branch 'master', remote-tracking branch 'remotes/fdolzanes1/master' into Cont

Conflicts: