my first commit
Merge branch 'master' of https://github.com/jbainesy/java-homework

Necessary to merge contents so I can push my first commit.