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

Conflicts:
	shamrock/index.html

diff --cc amelia/index.html
Simple merge

diff --cc cerulean/index.html
Simple merge

diff --cc cosmo/index.html
Simple merge

diff --cc cyborg/index.html
Simple merge

diff --cc default/index.html
Simple merge

diff --cc index.html
Simple merge

diff --cc journal/index.html
Simple merge

diff --cc readable/index.html
Simple merge

diff --cc simplex/index.html
Simple merge

diff --cc slate/index.html
Simple merge

diff --cc spacelab/index.html
Simple merge

diff --cc spruce/index.html
Simple merge

diff --cc superhero/index.html
Simple merge

diff --cc united/index.html
Simple merge