cleaning up master-branch, look into gh-pages