checking in index.html
Merge branch 'team1-mohammed' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team1-mohammed

Conflicts:
	public/index.html
Updated Gemfile.lock file
Merge branch 'team1-mohammed' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team1-mohammed

Conflicts:
	public/index.html
Update index for Valentine's day
Update index.html
comment
comment
Merge branch 'master' of github.com:SeaUnivCs/FreshTomatoSaasApp into team1-mohammed

Conflicts:
	public/index.html
commit
Merge pull request #1 from SeaUnivCs/team1-mohammed

Merging changes from Team1-mohammed branch