Updated the Gemfile on DB setting for Dev and Prod envs
added index.html
index.html commit
merge
胸躍るな世界
Added index.html
Merge https://github.com/SeaUnivCs/FreshTomatoSaasApp into team6-daniel

Conflicts:
	public/index.html
Merge https://github.com/SeaUnivCs/FreshTomatoSaasApp into team6-daniel

Conflicts:
	public/index.html
Edited index.html
Merge branch 'team6-daniel' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team6-daniel

Conflicts:
	public/index.html
test
test
Fixed files
Fixed files2
Eric's commit
sleepingkirby
Merge branch 'master' of https://github.com/SeaUnivCs/FreshTomatoSaasApp
update production.rb so that when no Saas and CoffeeScript Heroku can serve the CSS and javascript files
add index file
add index file?