Adding meld as merge tool.
Improving marathon commands.
ignorando warning de "import *".