reconciled master and gh pages