Commented out bad code

There were merge conflicts with MikeM's dev branch. I commented out my
attempts at health bar and Swapping to see if it would work without
conflicts.