Added filter to portfolio graphs
Merge branch 'integrate' of https://github.com/COSI236TA/Trade_Assistant into integrate

Conflicts:
	app/views/iframe/get_portfolio_html.html.erb
Added filter to portfolio graphs
Added filter to portfolio graphs
Added filter to portfolio graphs
Merge pull request #52 from COSI236TA/integrate

Integrate