add index file
add index file?
Updated Gemfile.lock file
resolved index.html local conflict
LOL
LOL
Merge branch 'master' of https://github.com/SeaUnivCs/FreshTomatoSaasApp
confusion.