Added menus and character selection, also building ents in level generation
Resolved a merge conflict