added a comment
added c-style comments
Merge branch 'beforeLast'

Conflicts:
	src/TestClass.java