Added a potential memory bug?
Merge branch 'master' of https://github.com/awwong1/c297proj