Merge pull request #1 from stuycs-softdev/z

EDited twof iles I did the merge - it was almost as awesome as nano