jekyll
Merge branch 'gh-pages' of https://github.com/gregleblanc/ecommerce-website into gh-pages

Conflicts:
	css/buttons.css
	css/media-object.css
	css/typography.css
	styleguide/bucket-small.html
	styleguide/buttons.html
	styleguide/search-field.html