comments

changed comments
?
Merge remote-tracking branch 'origin/master'

Conflicts:
	lab8/nbproject/private/private.xml
	remote/nbproject/private/private.xml