fixed CMakeLists
Merge branch 'master' of https://github.com/StanfordDrivingTeam/driving_public
Merge branch 'master' of https://github.com/StanfordDrivingTeam/driving_public