Merge pull request #1 from emblaser/hw

adding files
Merge pull request #2 from emblaser/hw

mostly just testing git through intellij
Merge pull request #5 from emblaser/master

Changes to main