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
Merge branch 'master' of https://github.com/SeaUnivCs/FreshTomatoSaasApp
add index file
add index file?
Committing public/index.html
Added index.html file
added index.html to public
add index file