Tested using javascript
Changes to settings, not finished
Merge branch 'master' of https://github.com/COSI236TA/Trade_Assistant into integrate

Conflicts:
	app/assets/stylesheets/bootstrap.css
Merge pull request #33 from COSI236TA/wenbin

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

Conflicts:
	config/routes.rb
Latest
Revert to c727ca85dced31567c9d76d55efc027ec882c119
Simple settings page, allows users to edit account info
Merge pull request #34 from COSI236TA/integrate

Integrate
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
latest
Merge branch 'master' into integrate

Conflicts:
	config/routes.rb
Working autocomplete, settings page