more postgres
fixed conflicts

Merge branch 'master' of heroku.com:stocktickerapps

Conflicts:
	app/controllers/company_industry_controller.rb