set up postgresql
Merge branch 'master' of https://github.com/MichiMensing/LekkerEnergieCupApp

Conflicts:
	Gemfile.lock