New stuff, removed stuff
Merge branch 'master' of https://github.com/mokah/java-practice
New stuff, removed stuff, clean up