Started to set up textures
recomitting to fix merge errors
Okay, merge errors are ACTUALLY fixed now.