cleaning up code, working on bugs
Merge branch 'master' of https://github.com/IEOR140-T5/Project2-PC