Merge fail
Move new images to assets
Prevent out of bounds in shuffleTex (only happens if null texture passed in)