Added a simpler merge test.
Merge pull request #183 from pelson/img_tiles_v2

Added a simple merge test.