add database
Merge branch 'master' of https://github.com/connec10/travel_vs

Conflicts:
	app/controllers/index_controller.rb
	app/views/index/index.html.erb
	config/routes.rb