memory leak crashes program on shutdown
Merge branch 'Assignment_2' of https://github.com/rmawong/EECE314 into Assignment_2