finish merge
adding the mazelayer. now the transition is smooth. added the cactus bombs