Committing and pushing .dist folder
Blowing away the repo to only add my .dist folder
Merge branch 'gh-pages' of github.com:fourkitchens/texasexes-style-guide into gh-pages
Removing .dist folder.
Merge branch 'gh-pages' of github.com:fourkitchens/texasexes-style-guide into gh-pages

Conflicts:
	Gemfile.lock
	bower.json
	components/components.yml
	index.html
	package.json
	sass/te-styleguide.scss
Adding contents of dist folder