Merge branch 'gh-pages' of https://github.com/i2ichard/DWS1 into gh-pages

Conflicts:
	mipana-richard-markup/chipotle_recipe.html
	template.html