pushing own code before adding kelly's
Merge branch 'master' of https://github.com/Prime11/dpm-final
Merge branch 'master' of https://github.com/Prime11/dpm-final
Changed Navigation, Wrangler and Point classes