Modified javadoc
Modified javadoc
Modified javadoc
Update main.java
Update main.java
Modified javadoc
Merge pull request #1 from diegorugg/master

Merge of some little javadoc work