Database CSV import
Handle data from DB and serve to html.
Update Gemfile.lock for heroku
Merge commit '204faef9df6abb839cc1af55d52590b3aff6fe6a'

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb