name changes
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into impact