Resolvendo conflitos.
Merge branch 'master' of https://github.com/tioago/ES.git