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

Conflicts:
	Car.cs