Fixing setup using postgresql database
Merge branch 'master' of github.com:retallicka/portfolio

Conflicts:
	Gemfile