finished 1,3
Finished HW 1
Merge branch 'master' of github.com:jcsims/544