tja
Merge branch 'master' of github.com:protective/Dat10

Conflicts:
	src/getTrajectories.py
images
usefull