Test conflict
Merge branch 'master' of
ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git

Conflicts:
	src/ghzclicker/main.java
Merge branch 'master' of
ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git

Conflicts:
	src/ghzclicker/main.java