conflistc
Merge branch 'master' of https://github.com/Test-Soft-Car/TestProject

Conflicts:
	src/Sample.java