create a conflict
Merge branch 'master' of https://github.com/DanailPanayotov/KingSurvival-byTeamCalifornium

Conflicts:
	Car.cs