test2
Merge branch 'master' of https://github.com/MyPlanet-Qwirks/foodspokes

Conflicts:
	index.html