the great big refactor
Merge branch 'dev' of github.com:jxb532/EECS366-HW4 into dev