Test twitter and sentiment analyze
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant

Conflicts:
	app/views/portfolios/get_portfolio.html.erb
Revert to 8b6c980dc20a29a357a86e65bc523a1b023ae8f5 because previous merge broke program