Merge pull request #18 from Noahhh/homework

Homework
pulling
Merge branch 'master' into homework
working on resolved