latest
Latest
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
latest
Wenbin's branch
Merge pull request #35 from COSI236TA/temp

Wenbin's branch
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
Merge branch 'master' into integrate

Conflicts:
	config/routes.rb
Working autocomplete, settings page
inital commit!
latest
latest
change 'up to' and 'down to' to 'More than' and 'Less than'
latest
raw RuleHistory model
autocompletion: new it prevents duplicates
rule page padding
Merge pull request #37 from COSI236TA/joe

rule page padding
center form for rule page
Merge pull request #38 from COSI236TA/joe

center form for rule page