fix line problem in trajectory.py
Merge branch 'master' of https://github.com/ferdianjovan/morse_people_tracker

Conflicts:
	scripts/.log.py.swp