Temp map.json
Merge branch 'master' of github.com:bbqcode/game-off-2013
Added idea in gitignore
Merge branch 'master' of github.com:bbqcode/game-off-2013
Added tiles