Merge pull request #1 from janm399/master

Initial outline of the Java codestyle