changed m1
Merge branch 'master' of https://github.com/achatzig/ProjectSE.git
print test m1()
Merge branch 'master' of https://github.com/achatzig/ProjectSE.git
change m2
Merge branch 'master' of https://github.com/achatzig/ProjectSE.git

Conflicts:
	src/Beta.java