Remove more leaks.
Merge branch 'dev' of github.com:jxb532/EECS366-HW7 into dev

Conflicts:
	main.cpp