Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages
Add server files.
Merge pull request #1 from antimega/gh-pages

Updating with github-pages and server files