Intro to Java 17/4/2013

Fixed all checkstyle issues