A couple of new features:
---
* add new rule as child resourse of user
* display rules owned by the user in dashboard
* rule description
* in dashboard, it will show whether the rule is triggered or not
Fix bugs
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant

Conflicts:
	app/controllers/rules_controller.rb
	app/models/rule.rb
	app/views/dashboard/index.html.erb