link
Merge branch 'gh-pages' of github.com:jimthoburn/karma-redesign into gh-pages

Conflicts:
	home.html
Merge branch 'gh-pages' of github.com:jimthoburn/karma-redesign into gh-pages