Merge branch 'working' into gh-pages
Remove github stuff.
Merge branch 'working' into gh-pages
Added CNAME