1. This project is mainly for Trajectory processing and analyzing.
Merge branch 'master' of https://github.com/liyaguang/TrjTools

Conflicts:
	.gitignore
	LICENSE
	README.md