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

Conflicts:
	res/GhzSaveGame.txt
Merge branch 'master' of ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git
Added Hertz / Second