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

Conflicts:
	src/ghzclicker/Controller.java
fixed
Merge branch 'master' of
ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git
Merge branch 'master' of ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git
Fixed image to a button
Merge branch 'master' of
ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git

Conflicts:
	src/ghzclicker/Controller.java
Added image and a image folder