test
update
update
Merge branch 'master' of https://github.com/MrHL/GED.git

Conflicts:
	src/org/ged/Hello.java