finished 2a
Merge branch 'master' of https://github.com/nbehdin/121HW3