Added api to fetch user preferences
Prod db.yml
Added unicorn config
Spell Mistake
Committing nginx config
Nginx config changes
Merge branch 'master' into es_implement

Conflicts:
	Gemfile.lock
	app/models/user.rb
	config/routes.rb