Initial commit 2
Merge branch 'master' of https://github.com/kelvinst/pg-json-rails-example

Conflicts:
	.gitignore