Version works well
Merge pull request #72 from COSI236TA/wenbin

Wenbin
Merge pull request #73 from COSI236TA/wenbin

Fix bug in drawing multiple stocks
Added colors and testing twitter
dashboard table colors and twitters test latest and chart check length
Merge remote-tracking branch 'origin/master' into integrate

Conflicts:
	app/assets/javascripts/createchart.js
Merge branch 'integrate'
Fixed portfolio bug
Merge pull request #75 from COSI236TA/integrate

Fixed portfolio bug
Fixed dashboard table colors (added opacity) and removed contacts
Merge pull request #76 from COSI236TA/integrate

Fixed dashboard table colors (added opacity) and removed contacts
Fixed loading twitter in get_portfolio.html
Merge branch 'integrate' of https://github.com/COSI236TA/Trade_Assistant into integrate
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate
Merge pull request #77 from COSI236TA/integrate

Integrate
add delete for portfolio(which will also deletes the assosicated rules