valami1
Merge branch 'master' of
https://github.com/allelustwillewigkeit/twotowers.git

Conflicts:
	TwoTowers/src/allelustwillewigkeit/twotowers/graphical/Controller.java