Added seperate css and javascript files, using ARRAY in iframe_controller test
Added seperate css and javascript files, using ARRAY in iframe_controller test
latest before pull
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate

Conflicts:
	app/assets/javascripts/chart.js
	app/controllers/iframe_controller.rb
	app/views/dashboard/index.html.erb
	app/views/layouts/iframe_portfolio.erb
	app/views/layouts/iframe_rule.erb
	app/views/portfolios/get_portfolio.html.erb
	app/views/rules/get_rule.html.erb
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant