Continue working on tilemap parsing
Merge branch 'master' of https://github.com/attemoi/ross-vs-roshambo