胸躍るな世界
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
Merge branch 'master' of https://github.com/SeaUnivCs/FreshTomatoSaasApp
no message
initial commit
RAWR
Updated Gemfile.lock file
saerawrfsdf
Merge branch 'team5-amanda' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team5-amanda

Conflicts:
	public/index.html
updated Gemfile.lock file
Updated Gemfile.lock file