added comment from Kelsi
added comment from Kelsi
Merge origin/master

Conflicts:
	JavaApplication1/src/javaapplication1/JavaApplication1.java