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

Conflicts:
	src/ghzclicker/Controller.java
Fixar med building price osv
Merge branch 'master' of
ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git

Conflicts:
	src/ghzclicker/Controller.java
Fixar mer Remerge metoden, price i buildings