Added the new Tiled stuff.

-Also added a new scene to test and merge with without conflicts