Merge image matrix and tile map
Merge branch 'master' of https://github.com/mparke/canvas_image_gallery