add gh pages script
Update docs
fix merge conflicts