Revised file
Merge branch 'team3-timothy' of https://github.com/SeaUnivCs/FreshTomatoSaasApp into team3-timothy

Conflicts:
	public/index.html