using postgresql
Merge branch 'master' of github.com:nicolasbrechet/survey

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
	config/secrets.yml