pages site
site update
fixed branching problem, git is hard