sync
Merge branch 'gh-pages' of https://github.com/bgreater/MGP-prototype into gh-pages

Conflicts:
	_site/codekit-config.json
	_site/images/home/carousel-headers.psd