sqlite3 => postgres
Merge commit 'b38c6f3'

Conflicts:
	Gemfile
	config/database.yml