commit 2
Merge origin/master

Conflicts:
	JavaApplication1/src/javaapplication1/JavaApplication1.java