Revert "Commit 1:"

This reverts commit 3143ea5b46f37e85865048e0906fea80014a2e5d.
Resolvendo conflitos
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml