User 1 change 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/core/HelloWorld.java