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

Conflicts:
	src/ghzclicker/LoginController.java
	src/ghzclicker/LoginGUI.java
Några små ändringar