Merge pull request #3 from pedropaG/master

warning with conflicts
Merge pull request #4 from pedropaG/master

Sync
Merge pull request #5 from pedropaG/master

Update my repos
Changes in AutoTips and Trade
Merge pull request #14 from JairoAlonso25/master

sync