Fix all da bugs
Merge branch 'gh-pages' of github.com:whiskers75/whiskchat into gh-pages