Added comments and javadoc comments to all Classes
Merge remote-tracking branch 'origin/master'