Revert "Revert "Merge branch 'master' of https://github.com/brunoflora/elosparaisopolis""

This reverts commit 6403c6ff7633b4cf015446bc894ece6cff682274.