reverted database to pg, whitespace
Merge branch 'master' of github.com:kellyjosephprice/rent-a-cat

Conflicts:
	app/models/cat_rental_request.rb
	config/database.yml