added some vi 2
Merge branch 'master' of https://github.com/jrlinde/TrackingExample into ContributorBranch