Committing public/index.html
胸躍るな世界
commit
commit
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
Merge branch 'team6-daniel' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team6-daniel

Conflicts:
	public/index.html
test