Latest
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate

Conflicts:
	db/schema.rb
final
..
commit before pull
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/rule_match_result/new_rule.erb
	app/views/sessions/new.html.erb
	app/views/users/_form.html.erb
Merge pull request #16 from COSI236TA/integrate

Integrate