Cleaned up TronWorld
Weird merge conflict on classes