Indentation and last code
Merge branch 'master' of github.com:Silverwyrda/javapocalypse