no longer murdering random pointers
Merge branch 'dev' of github.com:jxb532/EECS366-HW7 into dev