Merge branch 'master' of github.com:mikobautista/TartanTrades
Merge branch 'master' of github.com:mikobautista/TartanTrades