Progress
Merge branch 'master' of github.com:foodblog/foodblog.github.io

Conflicts:
	index.html