dsfsf
Merge branch 'master' of https://github.com/dutchgold92/TrafficSim-cuda

Conflicts:
	cuda.cu
Road connections implemented in CUDA