moves up a directory; lots of changes
Merge branch 'master' of https://github.com/stinkyfingers/practice