added CNAME file
cleanup
Merge branch 'gh-pages'
fixed master branch