index.html commit
merge
daniel loves committing codegit add index.htmlgit add index.html
Update gemfile.lock
Merge branch 'team6-daniel' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team6-daniel
fixed the conflict
gixed the branch
Merge branch 'master' of https://github.com/SeaUnivCs/FreshTomatoSaasApp