correcoes exoneracao
merge conflito
Merge branch 'master' of https://github.com/sikora/siac
Merge branch 'master' of https://github.com/sikora/siac