adding curving functionality and testing of graph test
fixed merge conflict with Graph.java