Testing merging part dos.

Signed-off-by: fad4470 <fad4470@rit.edu>
Merge branch 'master' of https://github.com/fad4470/GDD-Racer.git

Conflicts:
	Test.txt

Signed-off-by: fad4470 <fad4470@rit.edu>