stashed changes
Merge branch 'master' of github.com:muzzi11/cargo
Finished basic Buy/Sell state