added vertex and edge classes
fixing merge conflicts