rm cname
cname added
Merge branch 'master' into gh-pages
fix base
fixes
web compile with makefile