Merge branch 'Sarah' into alec-dev
Merge branch 'master' into alec-dev
Added dist_cost field to Node, so that we can pass only the sum of distance costs to the child node
Added distance function so the dist_cost isn't always 0
Merge branch 'alec-dev'