cleaned up a few lines
Merge branch 'master' of https://github.com/rkreiter/javaProject4