Added some comment to java file
Added C style comments
Merge branch 'beforeIcommented'

Conflicts:
	src/TestClass.java