Configuracion de la base de datos postgresql en heroku
Merge branch 'master' of https://github.com/joshua1983/LostPetWeb

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
	config/routes.rb
	db/seeds.rb