Added a tileset to the project as a merge test