11/22/13 Update
Merge branch 'gh-pages' of https://github.com/bgreater/MGP-prototype into gh-pages

Conflicts:
	_site/alcohol-product/index.html
	_site/alcohol/index.html
	_site/food-category/index.html
	_site/food-product/index.html
	_site/food-sub-category/index.html
	_site/food/index.html
	_site/index.html