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

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
latest
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant
latest
Merge branch 'master' into integrate

Conflicts:
	config/routes.rb