~
Merge branch 'master' of github.com:dVaffection/java-misc