rails new liquidpub --database=postgresql
Merge branch 'master' of https://github.com/thoughtworks/liquidpub

Conflicts:
	.gitignore