merging tile stuff with nam's stuff
Merge branch 'master' of https://github.com/roydor/Union