modify on new_rule
fix conflict
fixing rules page
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant

Conflicts:
	Gemfile.lock
	app/views/rules/new.html.erb