Merge branches 'master', 'master', 'master', 'master', 'master', 'master' and 'master' of github.com:massiccio/java
fixed indentation
Merge branches 'master', 'master' and 'master' of github.com:massiccio/java