Resetting master

Resetting the master branch so we can have a place to develop the
project for the prototype car
Merge branch 'develop'