fixed weird merge stuff
added new textures!!!!!!!!!!!!!!!

YAY!!!!!