renders submitted page
nearly committed
Merge branch 'master' into develop
some gems things
sqlite3
gem thing
database
sqlite3 again
thing
nothing
back to pg
Merge branch 'develop'

Conflicts:
	.gitignore
	Gemfile