fixed merge conflicts
Add description to directions
Can add new directions between two existing villages
Can view directions
fixed merge conflicts
Merge pull request #2 from morganwildermuth/directions

Directions