First commit
Merge https://github.com/nmmcdona/Java-Stuff

First commit.