start the collaboration!
fixed the bike.
included missing file.
working away on the car.
added new car.
merging bike fixes into master.
merged car branch
resolve merge conflicts.