Merge pull request #17 from COSI236TA/integrate

Integrate
Solve conflict
add spring automatically generated file
dashboard changed due to user session status
show logged-in user email left to the logout button
update rules.md
minor
improve sessions control among pages
---
* In login page, if already logged in, user is redirected to dashboard
* In dashboard, if not logged in, user is redirected to log in page
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
Modify the layout:
---
* Add the close tag </header>
* Remove duplicated header in home/index
* Remove binary_background.jpg from header
* Add binary_background to landing page(move it to the home.css)
* Other minor changes
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
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
buttons and table for dashboard
table layout
fix bug in dashboard css
Added Tests For Users