texture cleanup

made a catch all SOIL texture loading function, renamed collision.cpp/.h
to combat.cpp/.h