Some stuff
Merge branch 'donald' of https://github.com/joshcc3/jphack into donald
ok.. nothing to see here, move on