Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages

Conflicts:
	amelia/index.html
	cerulean/index.html
	cosmo/index.html
	cyborg/index.html
	default/index.html
	index.html
	journal/index.html
	readable/index.html
	simplex/index.html
	slate/index.html
	spacelab/index.html
	spruce/index.html
	superhero/index.html
	united/index.html

diff --git a/.gitignore b/.gitignore
index 05aa84c..255ba43 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 components
 node_modules
 build
+/CNAME\r
+/CNAME\r

diff --git a/CNAME b/CNAME
deleted file mode 100644 (file)
index cd527f5..0000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-bootswatch.com
\ No newline at end of file