Conflict check
Merge branch 'master' of https://github.com/pbartha/TheTwoTowers

Conflicts:
	src/main/Main.java