merged about branch, updated ghpages