added a torch
added fire and enabled glowing objects
finished merge?