Moved Menu into class and added to main game
Merge branch 'refs/heads/menu'