mostly just testing git through intellij
Merge pull request #2 from emblaser/hw

mostly just testing git through intellij