Merging error with CMakeLists.txt
Merge branch 'master' of https://github.com/dgoldberg92/tray-racer