changes
Merge branch 'master' of https://github.com/pfarrar1/millionDollarFoodIdea

Conflicts:
	index.html