Merge pull request #47 from COSI236TA/wenbin

Wenbin
Fixed routes portfolio issue
Merge pull request #48 from COSI236TA/integrate

Fixed routes portfolio issue
listing porfolio
Changes to lightbox css for rules and portfolio page
Merge pull request #49 from COSI236TA/integrate

Changes to lightbox css for rules and portfolio page
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate
Changes to portfolio page
Merge pull request #50 from COSI236TA/integrate

Integrate
add default rule name and default rule description