added idea to ignore
Merge branch 'master' of github.com:anton-github/game
Merge branch 'master' of github.com:anton-github/game
map init in progress
merge finished
grid rendering fixed