for merge
fixed conflicts
fixed getTile
Merge branch 'LoadMenu' of https://github.com/khattana/CatWars into LoadMenu