addded resample code
fixed merge issues i hope
Merge branch 'master' of https://github.com/MaciCrowell/CompRoboProject2