dan updates

*add ability to remove stock from portfolio
*add ability to mark a stock as sold
*add multiple entry for same symbol for different trades
resolve conflicts