no message
initial commit
RAWR
saerawrfsdf
Merge branch 'team5-amanda' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team5-amanda

Conflicts:
	public/index.html
updated Gemfile.lock file
Updated Gemfile.lock file
Merge branch 'team5-amanda'

Conflicts:
	public/index.html
Merge branch 'team5-amanda' of https://github.com/SeaUnivCs/FreshTomatoSaasApp
Merge branch 'master' of https://github.com/SeaUnivCs/FreshTomatoSaasApp

Conflicts:
	Gemfile.lock
	public/index.html
	public/index2.html
Merge branch 'master' of https://github.com/SeaUnivCs/FreshTomatoSaasApp

Conflicts:
	public/index.html