Add callOnTracks and merge offsetFrames

Had a conflict with Liz's version due to whitespace needed to reconcile
offsetFrames from Liz's with my additions to callOnTracks and all the
other methods that should use callOnTracks
Create comments to switch between Liz and Jay

This way we can work on the same file without having to reenter paths
to files each time.
Merge branch 'master' of https://github.com/jaywarrick/R-Adhesion

Conflicts:
	OOTracking.R
	Template.R