commit
fix conflicts?

Conflicts:
	pages/cuisines.html
	pages/ingredients.html
	stylesheets/ingredients.css