all the changes
Merge branch 'master' of https://github.com/MyPlanet-Qwirks/foodspokes

Conflicts:
	css/component2.css
	css/style2.css