local changes 1
Merge origin/master

Conflicts:
	src/javaapplication2/JavaApplication2.java