anotherMethod()
Merge branch 'master' of https://github.com/plass/se.HalloWelt.git

Conflicts:
	src/HalloWelt_renamed.java