turned off Jekyll
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Deleted comments
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Merge branch 'new-hotness' into gh-pages
Merge branch 'master' into gh-pages
Updated readme
Merge branch 'gh-pages'