Add some comments to my java code
Add teh proper comments
Merge branch 'BeforeICommented'

Conflicts:
	src/TestClass.java