Signup and login redirected to new rules
?
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate
Merge pull request #10 from COSI236TA/integrate

Integrate