Fixed GUI to not display '...' if we got out of bounds.
Stay with the old merging and reMerge
Merge branch 'master' of
ssh://git@github.com/thesymbol/GHzClickerMAHProjekt.git

Conflicts:
	src/ghzclicker/Controller.java