Updated .gitignore to ignore .swo files
Merge branch 'master' into stacks
Implemented most of the TA's pseudocode.