Map
Merge branch 'master' of https://github.com/orestisMelkonian/SA4_game.git

Conflicts:
	src/main/java/ptoma/hexoral/Map.java
Merge branch 'master' of https://github.com/orestisMelkonian/SA4_game