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