user 99 change 1
Merge branch 'master' of https://github.com/madmarcos/Test2.git

Conflicts:
	src/core/HelloWorld.java