Finished/added JUnit Test/javadoc/better use of main