Guess what I'm doing: merge conflicts
Merge remote-tracking branch 'origin'
Merge conflicts
Merge branch 'master' of https://github.com/jaxoncreed/StarSpace
Worked on functionality for the Trade Ctrl