catering html file
Merge branch 'master' of https://github.com/paulinele/artofespresso

	# Please enter a commit message to explain why this merge is necessary,