main2.cpp is the real main, main.cpp is my tester
Merge branch 'master' of https://github.com/dgoldberg92/tray-racer