Merge pull request #55 from COSI236TA/wenbin

Wenbin
Merge pull request #56 from COSI236TA/integrate

Fixed chart size bug
Merge pull request #57 from COSI236TA/integrate

Fixed ajax for loop redundancy
Merge pull request #58 from COSI236TA/integrate

Integrate
add gem sucker punch
background process works properly. need to refine RuleHistory
refine RuleHistory such that there would not be too many redundant entries
Merge pull request #59 from COSI236TA/wenbinx

Wenbinx
change the update interval to 300 seconds
Merge pull request #60 from COSI236TA/wenbin

change the update interval to 300 seconds
formatted the createchart.js
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
move get_porfolio.htm.erb to views of portfolio and move the corresponding action to portfolios' controller
similar to changes to get_portfolio
---
1. Change the route
2. Move get_rule.html.erb to the rule's view folder
3. Move the action to rule's controlller
Merge pull request #61 from COSI236TA/wenbin

Wenbin
add link in portfolio and rule pages
move all ajax requests to ajax controller
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
refine the routes
add rule edit page