more fixes to buy.cpp and sell.cpp, still working on them though
more fixes to buy.cpp and sell.cpp, still working on them though  (Conflicts resolved)
done merging