Use PostgreSQL for deployment with Heroku. #4
Merge branch 'master' of github.com:sijbrandij/railsgirls-nl

Conflicts:
	Gemfile.lock
Configured for deployment with Heroku. #4