homework code
Merge branch 'master' of https://github.com/jaeadie/project_1