Tried pulling ivan's update. Manually excluding changes in bin.
Merge branch 'rework' of https://github.com/darrensapalo/desipat_phase3.git into rework