I need an updated branch

I've deleted all my branches except for one. I would like to merge with Mike M's dev branch now. If you have any conflicts, it'll probably be in the Level class. Just keep all your stuff and delete any problems my code will cause. If you could somehow keep my 0.tmx file, that would be great. My level has a slightly more colorful design than the plain platformertiles tileset, and I would like you guys to have access to the tilesets if you save the file as something else.