edit
Merge branch 'master' of https://github.com/temsan/Lesson2

Conflicts:
	Lesson2/Vehicle.h
	Lesson2/Vehicle.m
home work 3