now... find the linear msd

	modified:   tracks.py
now... find the linear msd

	modified:   tracks.py
Merge branch 'subtraction' of /home/lawalsh/Git_Repos/Tracking into subtraction
now... find the MSDs

	modified:   tracks.py
	modified:   otracks.py
Merge branch 'subtraction' of /home/lawalsh/Git_Repos/Tracking into subtraction
now... find the MSDs

	modified:   tracks.py
	modified:   otracks.py
Merge branch 'subtraction' of /home/lawalsh/Git_Repos/Tracking into subtraction
now... find the MSDs

	modified:   tracks.py
	modified:   otracks.py
Merge branch 'subtraction' of /home/lawalsh/Git_Repos/Tracking into subtraction

Conflicts:
	otracks.py
now... find the MSDs

	modified:   tracks.py
	modified:   otracks.py
Merge branch 'subtraction' of /home/lawalsh/Git_Repos/Tracking into subtraction

Conflicts:
	otracks.py
Merge branch 'subtraction' of /home/lawalsh/Git_Repos/Tracking into subtraction

Conflicts:
	otracks.py
Merge branch 'subtraction' of /home/lawalsh/Git_Repos/Tracking into subtraction

and some typos