merge conflicts, fixed in a sec
Merge branch 'master' of https://github.com/rileychapman/geneticCar
Merge branch 'master' of https://github.com/rileychapman/geneticCar
fixing merge conflics ?