Adding latest stuff
Merge branch 'master' of https://github.com/R1ckyG/Mecha-Trader