Fixing bug. Did not add Larry's wife before
Changed Marie to Johnny
Merge branch 'BUGFIX'

Conflicts:
	PersonCar.rb
Resolved conflict between Ford and Mini Cooper