Configured for PostgreSQL
Merge branch 'master' of https://github.com/boersmamarcel/challengesplatform

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