Merge branch 'master' of https://github.com/ChristianVirtual/FAHMMCore17Trajectoy

Conflicts:
	README.md
Correct readme