Final commit for AAE730 problem set 2