cd ../ works right
all / commands work
Merge branch 'master' into gh-pages