merging
merging file
Merge branch 'master' of https://github.com/gaylel/intrahosts-network
small bug in trajectories