testing branch vs master

perhaps I can't merge on slipring.github.io parent dir?