quality of life changes

Make manual combine for items and champions a thing.

Increase timer for battles. I should not lose a battle or take damage because the time runs out when I am winning.