Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate
Changes to portfolio page
Merge pull request #50 from COSI236TA/integrate

Integrate