Postgres installed.
Merge branch 'master' of github.com:sozialhelden/chef-repo

Conflicts:
	cookbooks/spielwiese/recipes/default.rb